aloha-vue 1.2.195 → 1.2.197

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.195",
+  "version": "1.2.197",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/AMenu/compositionAPI/AMenuSearchAPI.js

@@ -6,6 +6,7 @@ import {
 import AKeyId from "../../const/AKeyId";
 import AKeyLabel from "../../const/AKeyLabel";
 import {
+  escapeRegExp,
   forEach,
 } from "lodash-es";
 
@@ -49,7 +50,7 @@ export default function AMenuSearchAPI(props, {
       rest: {},
     };
     if (isSearchActive.value) {
-      const RE = new RegExp(modelSearch.value, "gi");
+      const RE = new RegExp(escapeRegExp(modelSearch.value), "gi");
       forEach(dataProParentList.value, (items, index) => {
         let isVisible = false;
         forEach(items, item => {

package/src/AMenu2/compositionAPI/SearchAPI.js

@@ -6,6 +6,7 @@ import {
 
 import AKeyLabel from "../../const/AKeyLabel";
 import {
+  escapeRegExp,
   forEach,
 } from "lodash-es";
 
@@ -40,10 +41,14 @@ export default function SearchAPI(props, {
     }
   };
 
+  const modelSearchEscapeRegExp = computed(() => {
+    return escapeRegExp(modelSearch.value);
+  });
+
   const itemsWithSearch = computed(() => {
     const ITEMS = [];
     if (isSearchActive.value) {
-      const RE = new RegExp(modelSearch.value, "gi");
+      const RE = new RegExp(modelSearchEscapeRegExp.value, "gi");
       forEach(dataKeyById.value, item => {
         const ITEM_LABEL = item[AKeyLabel];
         if (`${ ITEM_LABEL }`.search(RE) !== -1) {

package/src/ATable/ATableHeaderThAction/ATableHeaderThActionItem/compositionAPI/AttributesComponentAPI.js

@@ -3,6 +3,10 @@ import {
   toRef,
 } from "vue";
 
+import {
+  escapeRegExp,
+} from "lodash-es";
+
 export default function AttributesComponentAPI(props, {
   attributesForRoot = computed(() => ({})),
   isColumnVisible = computed(() => false),
@@ -15,7 +19,7 @@ export default function AttributesComponentAPI(props, {
     if (!searchColumnModel.value) {
       return true;
     }
-    const RE = new RegExp(searchColumnModel.value, "gi");
+    const RE = new RegExp(escapeRegExp(searchColumnModel.value), "gi");
     return `${ labelTranslated.value }`.search(RE) !== -1;
   });
 

package/src/ATable/ATableTdAction/ATableTdAction.js

@@ -71,7 +71,6 @@ export default {
 
     const {
       buttonActionsId,
-      buttonFirstActionId,
       isRowActionsDropdownVisible,
       rowActionsFiltered,
     } = RowActionsAPI(props);
@@ -92,7 +91,6 @@ export default {
 
     return {
       buttonActionsId,
-      buttonFirstActionId,
       columnsScrollInvisibleText,
       countColumnsScrollInvisible,
       isColumnsScrollInvisibleDropdownVisible,
@@ -214,7 +212,6 @@ export default {
                   indexFirstDropdownActionMobile: isUndefined(this.columnActionsOnePlusDropdownOptions.indexFirstDropdownActionMobile) ? 1 : this.columnActionsOnePlusDropdownOptions.indexFirstDropdownActionMobile,
                   minDropdownActions: isUndefined(this.columnActionsOnePlusDropdownOptions.minDropdownActions) ? 1 : this.columnActionsOnePlusDropdownOptions.minDropdownActions,
                   actionsClasses: this.columnActionsOnePlusDropdownOptions.actionsClasses || ["a_btn a_btn_primary a_text_truncate"],
-                  actionsIds: [this.buttonFirstActionId],
                 }, this.$slots) :
               "",
           ]) :

package/src/ATable/compositionAPI/RowActionsAPI.js

@@ -20,21 +20,24 @@ import {
 
 export default function RowActionsAPI(props) {
   const columnActionsView = toRef(props, "columnActionsView");
+  const isFooter = toRef(props, "isFooter");
   const row = toRef(props, "row");
   const rowIndex = toRef(props, "rowIndex");
-  const isFooter = toRef(props, "isFooter");
 
+  const columnActionsOnePlusDropdownOptions = inject("columnActionsOnePlusDropdownOptions");
   const rowActions = inject("rowActions");
   const tableId = inject("tableId");
 
-  const buttonFirstActionId = computed(() => {
-    return `${ tableId.value }_action_${ rowIndex.value }_first`;
-  });
-
   const buttonActionsId = computed(() => {
     return `${ tableId.value }_action_${ rowIndex.value }`;
   });
 
+  const indexFirstDropdownActionLocal = computed(() => {
+    return isUndefined(columnActionsOnePlusDropdownOptions.value.indexFirstDropdownAction) ?
+      1 :
+      columnActionsOnePlusDropdownOptions.value.indexFirstDropdownAction;
+  });
+
   const getRowActionText = ({ rowAction }) => {
     if (rowAction.text) {
       return rowAction.text;
@@ -204,6 +207,30 @@ export default function RowActionsAPI(props) {
     return undefined;
   };
 
+  const getRowActionIds = ({ rowActionIndexVisible }) => {
+    if (columnActionsView.value === "dropdown") {
+      return {
+        id: buttonActionsId.value,
+        ids: [buttonActionsId.value, tableId.value],
+      };
+    }
+
+    if (rowActionIndexVisible < indexFirstDropdownActionLocal.value) {
+      const buttonId = `${ buttonActionsId.value }_${ rowActionIndexVisible }`;
+
+      return {
+        buttonId,
+        id: buttonId,
+        ids: [buttonId, tableId.value],
+      };
+    }
+
+    return {
+      id: buttonActionsId.value,
+      ids: [buttonActionsId.value, tableId.value],
+    };
+  };
+
   const replacePropertiesByRowAction = rowAction => {
     forEach(rowAction, (_, key) => {
       if (endsWith(key, "Callback")) {
@@ -265,17 +292,22 @@ export default function RowActionsAPI(props) {
             }
           }
           if (isFunction(rowAction.callback)) {
-            let buttonId = buttonActionsId.value;
-            if (columnActionsView.value !== "dropdown" && rowActionIndexVisible === 0) {
-              buttonId = buttonFirstActionId.value;
-            }
+            const {
+              buttonId,
+              id,
+              ids,
+            } = getRowActionIds({
+              rowActionIndexVisible,
+            });
+
+            rowAction.id = buttonId;
 
             const CALLBACK_DEFAULT = rowAction.callback;
             rowAction.callback = () => CALLBACK_DEFAULT({
               row: row.value,
               rowIndex: rowIndex.value,
-              id: buttonId,
-              ids: [buttonId, tableId.value],
+              id,
+              ids,
               rowAction,
             });
           }
@@ -296,7 +328,6 @@ export default function RowActionsAPI(props) {
 
   return {
     buttonActionsId,
-    buttonFirstActionId,
     isRowActionsDropdownVisible,
     rowActionsFiltered,
   };

package/src/filters/filterSearchHighlight.js

@@ -1,4 +1,5 @@
 import {
+  escapeRegExp,
   isNil,
 } from "lodash-es";
 
@@ -20,6 +21,6 @@ export default function(value, { searchModel = "", searchClass = "a_search_highl
   if (searchModel === "" || isNil(searchModel)) {
     return value;
   }
-  const RE = new RegExp(searchModel, "gi");
+  const RE = new RegExp(escapeRegExp(searchModel), "gi");
   return value.replace(RE, val => `<span class="${ searchClass }">${ val }</span>`);
 }

package/src/ui/compositionApi/UiSearchAPI.js

@@ -7,6 +7,7 @@ import {
 import AKeyLabel from "../../const/AKeyLabel";
 import AKeyId from "../../const/AKeyId";
 import {
+  escapeRegExp,
   forEach,
   get,
   isEmpty,
@@ -46,6 +47,14 @@ export default function UiSearchAPI(props, { emit }, {
     return toLower(modelSearch.value || "");
   });
 
+  const modelSearchEscapeRegExp = computed(() => {
+    return escapeRegExp(modelSearchLowerCase.value);
+  });
+
+  const modelSearchRE = computed(() => {
+    return new RegExp(modelSearchEscapeRegExp.value, "gi");
+  });
+
   const setElementsVisibleWithSearch = () => {
     const ELEMENTS_EXTRA_VISIBLE = {};
     const ELEMENTS_VISIBLE = {};
@@ -56,7 +65,7 @@ export default function UiSearchAPI(props, { emit }, {
         forEach(data.value, element => {
           const ELEMENT_LABEL = element[AKeyLabel];
           const ELEMENT_ID = element[AKeyId];
-          if (toLower(`${ ELEMENT_LABEL }`).indexOf(modelSearchLowerCase.value) !== -1) {
+          if (`${ ELEMENT_LABEL }`.search(modelSearchRE.value) !== -1) {
             ELEMENTS_VISIBLE[ELEMENT_ID] = true;
             let allGroupKeys = "";
             forEach(keyGroupArray.value, keyGroup => {
@@ -73,7 +82,7 @@ export default function UiSearchAPI(props, { emit }, {
         forEach(data.value, element => {
           const ELEMENT_LABEL = element[AKeyLabel];
           const ELEMENT_ID = element[AKeyId];
-          if (toLower(`${ ELEMENT_LABEL }`).indexOf(modelSearchLowerCase.value) !== -1) {
+          if (`${ ELEMENT_LABEL }`.search(modelSearchRE.value) !== -1) {
             ELEMENTS_VISIBLE[ELEMENT_ID] = true;
           }
         });
@@ -81,7 +90,7 @@ export default function UiSearchAPI(props, { emit }, {
       forEach(dataExtra.value, element => {
         const ELEMENT_LABEL = element[AKeyLabel];
         const ELEMENT_ID = element[AKeyId];
-        if (toLower(`${ ELEMENT_LABEL }`).indexOf(modelSearchLowerCase.value) !== -1) {
+        if (`${ ELEMENT_LABEL }`.search(modelSearchRE.value) !== -1) {
           ELEMENTS_EXTRA_VISIBLE[ELEMENT_ID] = true;
         }
       });