Commit d0925836 authored by Rob Phillips's avatar Rob Phillips
Browse files

Issue #3282678 by robphillips: Render Ajax progress throbber with loading text.

parent 000fc53f

choices_autocomplete.libraries.yml

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ choices: 
  dependencies:

    - core/drupal

    - core/once

    - core/drupal.ajax

css/choices.css

+4 −0
Original line number Diff line number Diff line
@@ -22,3 +22,7 @@ 
.choices__list--dropdown .choices__item.choices__item--autocomplete {

  pointer-events: initial;

}



.choices--autocomplete .ajax-progress {

  padding: 0;

}

css/choices.pcss.css

+4 −0
Original line number Diff line number Diff line
@@ -15,3 +15,7 @@ 
.choices__list--dropdown .choices__item.choices__item--autocomplete {

  pointer-events: initial;

}



.choices--autocomplete .ajax-progress {

  padding: 0;

}

js/choices.es6.js

+3 −1
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
      this.value = null;



      // Instantiate Choices.js.

      const config = JSON.parse(element.dataset.choices);

      config.loadingText = Drupal.theme("ajaxProgressThrobber", config.loadingText);

      this.choices = new Choices(element, {

        ...JSON.parse(element.dataset.choices),

        ...config,

        shouldSort: false,

        allowHTML: true,

        removeItemButton: true,

js/choices.js

+4 −3
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ 
      this.url = this.config.autocompletePath;

      this.cache = {};

      this.value = null;

      this.choices = new Choices(element, { ...JSON.parse(element.dataset.choices),

      const config = JSON.parse(element.dataset.choices);

      config.loadingText = Drupal.theme("ajaxProgressThrobber", config.loadingText);

      this.choices = new Choices(element, { ...config,

        shouldSort: false,

        allowHTML: true,

        removeItemButton: true,
@@ -163,4 +165,3 @@ 
    }

  };

})(Drupal, once);
 
 No newline at end of file
 
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["Drupal","once","ChoicesAutocomplete","constructor","element","labels","config","dataset","url","autocompletePath","cache","value","choices","Choices","JSON","parse","shouldSort","allowHTML","removeItemButton","classNames","containerOuter","item","addEventListener","clear","bind","Object","keys","forEach","choice","label","selected","removeActiveItems","setChoices","isMax","setNotice","maxItemText","hideDropdown","input","event","metaKey","maxlength","key","length","target","pattern","match","RegExp","preventDefault","timeout","detail","loadingText","clearTimeout","setTimeout","search","message","choiceList","append","_getTemplate","maxItemCount","getValue","setState","loading","addLoadingState","removeLoadingState","populate","fetch","encodeURIComponent","headers","then","response","json","catch","alert","t","items","values","Array","isArray","ids","map","matches","push","replace","trim","toLowerCase","filter","indexOf","autocreate","minlength","unshift","clearChoices","behaviors","choicesAutocomplete","attach","context","settings","choices_autocomplete"],"sources":["choices.es6.js"],"sourcesContent":["((Drupal, once) => {\n  /**\n   * Provides Choices.js autocomplete plugin.\n   */\n  class ChoicesAutocomplete {\n    /**\n     * @param {HTMLSelectElement} element\n     *   The select element.\n     * @param {Object} labels\n     *   An object of default option labels.\n     */\n    constructor(element, labels) {\n      this.element = element;\n      this.config = this.element.dataset;\n      this.url = this.config.autocompletePath;\n      this.cache = {};\n      this.value = null;\n\n      // Instantiate Choices.js.\n      this.choices = new Choices(element, {\n        ...JSON.parse(element.dataset.choices),\n        shouldSort: false,\n        allowHTML: true,\n        removeItemButton: true,\n        classNames: {\n          containerOuter: 'choices choices--autocomplete',\n          item: \"choices__item choices__item--autocomplete\",\n        },\n      });\n      element.addEventListener(\"change\", this.clear.bind(this));\n\n      // Set default choice labels.\n      if (labels) {\n        const { choices } = this.choices.config;\n        Object.keys(labels).forEach((value) => {\n          choices.forEach((choice) => {\n            if (choice.value === value) {\n              choice.label = labels[value];\n              choice.selected = true;\n            }\n          });\n        });\n        this.choices.removeActiveItems();\n        this.choices.setChoices(choices, \"value\", \"label\", true);\n      }\n\n      // Detect max selected items.\n      element.addEventListener(\"showDropdown\", () => {\n        if (this.isMax()) {\n          this.setNotice(this.choices.config.maxItemText);\n        }\n      });\n      element.addEventListener(\"addItem\", () => {\n        if (this.isMax()) {\n          // Hide dropdown if at max selections.\n          this.choices.hideDropdown();\n        }\n      });\n\n      // Non-allowed and maxlength input filtering.\n      this.choices.input.element.addEventListener(\"keydown\", (event) => {\n        if (\n          !event.metaKey &&\n          ((this.config.maxlength &&\n            event.key.length === 1 &&\n            event.target.value.length >= this.config.maxlength) ||\n            (this.config.pattern &&\n              event.key.length === 1 &&\n              !event.key.match(new RegExp(this.config.pattern, \"g\"))))\n        ) {\n          event.preventDefault();\n        }\n      });\n\n      // Bind to the search event.\n      let timeout = null;\n      element.addEventListener(\"search\", (event) => {\n        if (this.value !== event.detail.value) {\n          this.clear();\n          this.setNotice(this.choices.config.loadingText);\n        }\n        if (timeout) {\n          clearTimeout(timeout);\n        }\n        timeout = setTimeout(this.search.bind(this, event), 500);\n      });\n    }\n\n    /**\n     * Set dropdown notice message.\n     *\n     * @param {string} message\n     *   The message.\n     */\n    setNotice(message) {\n      this.choices.choiceList.clear();\n      this.choices.choiceList.append(\n        this.choices._getTemplate(\"notice\", message)\n      );\n    }\n\n    /**\n     * Check for max selected items.\n     *\n     * @return {boolean}\n     *   Returns TRUE if max reached. Otherwise, FALSE.\n     */\n    isMax() {\n      return (\n        this.choices.config.maxItemCount > 1 &&\n        this.choices.getValue(true).length >= this.choices.config.maxItemCount\n      );\n    }\n\n    /**\n     * Add or remove loading state.\n     *\n     * @param {boolean} loading\n     *   Boolean indicating to add or remove loading state.\n     */\n    setState(loading) {\n      if (loading) {\n        this.choices.containerOuter.addLoadingState();\n      } else {\n        this.choices.containerOuter.removeLoadingState();\n      }\n    }\n\n    /**\n     * Search on user input.\n     *\n     * @param {CustomEvent} event\n     *   The custom event.\n     */\n    search(event) {\n      this.value = event.detail.value;\n      if (this.cache[event.detail.value]) {\n        // Populate from static cache.\n        this.populate([...this.cache[event.detail.value]], event.detail.value);\n      } else {\n        this.setState(true);\n        fetch(`${this.url}?q=${encodeURIComponent(event.detail.value)}`, {\n          headers: { \"Content-Type\": \"application/json; charset=utf-8\" },\n        })\n          .then((response) => response.json())\n          .then((response) => {\n            // Store response in static cache.\n            this.cache[event.detail.value] = response;\n            if (this.value === event.detail.value) {\n              this.populate([...response], event.detail.value);\n            }\n          })\n          .catch(() => {\n            alert(Drupal.t(\"An error occurred. Please try again.\"));\n          });\n      }\n    }\n\n    /**\n     * Populate with entity autocomplete items.\n     *\n     * @param {Array} items\n     *   An array of items to populate.\n     * @param {String} input\n     *   The search input.\n     */\n    populate(items, input) {\n      this.setState(false);\n      let values = this.choices.getValue(true);\n      if (!Array.isArray(values)) {\n        values = typeof values !== \"undefined\" ? [values] : [];\n      }\n\n      // Gather current selection IDs and labels.\n      const ids = [];\n      const labels = values.map((value) => {\n        const matches = value.match(/\\s\\(\\d+\\)$/);\n        if (matches) {\n          ids.push(matches[0].replace(/\\D/g, \"\").trim());\n        }\n        return value\n          .replace(/\\s\\(\\d+\\)$/, \"\")\n          .toLowerCase()\n          .trim();\n      });\n\n      // Remove non-unique items based on current selections.\n      items = items.filter((item) => {\n        labels.push(\n          item.value\n            .replace(/\\s\\(\\d+\\)$/, \"\")\n            .toLowerCase()\n            .trim()\n        );\n        const matches = item.value.match(/\\s\\(\\d+\\)$/);\n        if (matches) {\n          return ids.indexOf(matches[0].replace(/\\W/g, \"\").trim()) === -1;\n        }\n        return labels.indexOf(item.value.toLowerCase().trim()) === -1;\n      });\n\n      // Allow selection of unique auto-created items.\n      if (\n        this.config.autocreate &&\n        (!this.config.minlength || input.length >= this.config.minlength) &&\n        labels.indexOf(input.toLowerCase().trim()) === -1\n      ) {\n        items.unshift({\n          value: input.trim(),\n          label: input.trim(),\n        });\n      }\n      this.choices.setChoices(items, \"value\", \"label\", true);\n    }\n\n    /**\n     * Clear populated entity autocomplete items.\n     */\n    clear() {\n      this.choices.clearChoices();\n    }\n  }\n\n  /**\n   * Attach Choices.js autocomplete.\n   */\n  Drupal.behaviors.choicesAutocomplete = {\n    attach: function attach(context, settings) {\n      once(\n        \"choices-autocomplete\",\n        \"select.js-choices-autocomplete\",\n        context\n      ).forEach((element) => {\n        element.choicesAutocomplete = new ChoicesAutocomplete(\n          element,\n          settings.choices_autocomplete\n        );\n      });\n    },\n  };\n})(Drupal, once);\n"],"mappings":"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"}
 
 No newline at end of file