@fctc/widget-logic 4.6.6 → 4.6.8

package/dist/hooks.js

@@ -155,12 +155,8 @@ var useCallAction = () => {
       context
     }) => {
       try {
-        const stableEnvContext = (0, import_react.useMemo)(
-          () => env?.context,
-          [env?.context?.lang]
-        );
         const menuContext = {
-          ...stableEnvContext,
+          ...env?.context,
           ...context
         };
         const loadRes = await queryLoadAction.mutateAsync({

package/dist/hooks.mjs

@@ -105,13 +105,13 @@ import {
 } from "@fctc/interface-logic/hooks";
 
 // src/hooks/core/use-app-provider.tsx
-import { createContext, useContext, useMemo as useMemo6 } from "react";
+import { createContext, useContext, useMemo as useMemo5 } from "react";
 
 // src/hooks/core/use-menu.ts
-import { useMemo as useMemo2, useState as useState2 } from "react";
+import { useMemo, useState as useState2 } from "react";
 
 // src/hooks/core/use-call-action.ts
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useState } from "react";
 
 // src/provider.ts
 var provider_exports = {};
@@ -135,12 +135,8 @@ var useCallAction = () => {
       context
     }) => {
       try {
-        const stableEnvContext = useMemo(
-          () => env?.context,
-          [env?.context?.lang]
-        );
         const menuContext = {
-          ...stableEnvContext,
+          ...env?.context,
           ...context
         };
         const loadRes = await queryLoadAction.mutateAsync({
@@ -374,7 +370,7 @@ var useMenu = ({
     defaultService
   );
   const [menuId, setMenuId] = useState2(void 0);
-  const configedIconData = useMemo2(() => {
+  const configedIconData = useMemo(() => {
     const data = menuData.data;
     return data?.map((item) => {
       return {
@@ -456,7 +452,7 @@ var useDetail = (sub) => {
 
 // src/hooks/core/use-profile.ts
 import { useQuery as useQuery2 } from "@tanstack/react-query";
-import { useEffect as useEffect3, useMemo as useMemo3 } from "react";
+import { useEffect as useEffect3, useMemo as useMemo2 } from "react";
 import { useTranslation } from "react-i18next";
 var useProfile = ({ service }) => {
   const { setUid, setLang, setUserInfo, env } = (0, provider_exports.useEnv)();
@@ -479,7 +475,7 @@ var useProfile = ({ service }) => {
       i18n.changeLanguage(userLocale?.id.split("_")[0]);
     }
   }, [userInfoQuery.isFetched]);
-  const context = useMemo3(() => {
+  const context = useMemo2(() => {
     if (userInfoQuery.data?.sub && userInfoQuery.data?.locale) {
       return {
         uid: Number(userInfoQuery.data.sub),
@@ -503,7 +499,7 @@ var useUser = ({ service }) => {
 };
 
 // src/hooks/core/use-view-v2.ts
-import { useMemo as useMemo4 } from "react";
+import { useMemo as useMemo3 } from "react";
 var useViewV2 = ({
   action,
   context,
@@ -512,7 +508,7 @@ var useViewV2 = ({
   xNode
 }) => {
   const { useGetView: useGetView2 } = (0, provider_exports.useService)();
-  const viewParams = useMemo4(() => {
+  const viewParams = useMemo3(() => {
     if (!action || !action?.res_model) {
       return void 0;
     }
@@ -546,7 +542,7 @@ var useViewV2 = ({
 
 // src/hooks/core/use-company.ts
 import { useQuery as useQuery3 } from "@tanstack/react-query";
-import { useEffect as useEffect4, useMemo as useMemo5 } from "react";
+import { useEffect as useEffect4, useMemo as useMemo4 } from "react";
 var useCompany = ({ service }) => {
   const { setAllowCompanies, setCompanies, setDefaultCompany, env } = (0, provider_exports.useEnv)();
   const { useGetCurrentCompany: useGetCurrentCompany2, useGetCompanyInfo: useGetCompanyInfo2 } = (0, provider_exports.useService)();
@@ -561,7 +557,7 @@ var useCompany = ({ service }) => {
     queryFn: fetchCurrentCompany,
     enabled: !!env?.defaultCompany
   });
-  const current_company_id = useMemo5(() => {
+  const current_company_id = useMemo4(() => {
     return currentCompany.data?.current_company_id;
   }, [currentCompany.data]);
   useEffect4(() => {
@@ -612,7 +608,7 @@ var AppProvider = ({
   const { env } = (0, provider_exports.useEnv)();
   const user = useUser({ service: env.default_service });
   const company = useCompany({ service: env.default_service });
-  const menuContext = useMemo6(() => {
+  const menuContext = useMemo5(() => {
     return combineContexts([
       {
         ...user?.context,
@@ -629,10 +625,10 @@ var AppProvider = ({
     domain: menuParams?.domain,
     defaultService: env.default_service
   });
-  const action = useMemo6(() => {
+  const action = useMemo5(() => {
     return menu?.state?.action;
   }, [menu?.state?.action, env?.context?.lang]);
-  const viewContext = useMemo6(() => {
+  const viewContext = useMemo5(() => {
     return combineContexts([
       menuContext,
       { ...(0, utils_exports.evalJSONContext)(action?.context) }
@@ -736,7 +732,7 @@ var useGetAction = ({
 };
 
 // src/hooks/core/use-get-specification.ts
-import { useMemo as useMemo7 } from "react";
+import { useMemo as useMemo6 } from "react";
 var useGetSpecification = ({
   model,
   viewData,
@@ -748,13 +744,13 @@ var useGetSpecification = ({
     fields
   };
   const initModel = useModel();
-  const modelInstance = useMemo7(() => {
+  const modelInstance = useMemo6(() => {
     if (viewData) {
       return initModel.initModel(baseModel);
     }
     return null;
   }, [baseModel, viewData, model]);
-  const specification = useMemo7(() => {
+  const specification = useMemo6(() => {
     if (modelInstance) {
       return modelInstance.getSpecification();
     }
@@ -764,7 +760,7 @@ var useGetSpecification = ({
 };
 
 // src/hooks/core/use-list-data.ts
-import { useMemo as useMemo8, useState as useState5 } from "react";
+import { useMemo as useMemo7, useState as useState5 } from "react";
 import {
   evalJSONDomain,
   formatSortingString,
@@ -908,7 +904,7 @@ var useListData = ({
     viewData,
     fields: mode === "kanban" ? viewData?.views?.kanban?.fields : viewData?.views?.list?.fields
   });
-  const listDataProps = useMemo8(() => {
+  const listDataProps = useMemo7(() => {
     if (!viewData || !action || !context) {
       return null;
     }

package/dist/index.js

@@ -4205,12 +4205,8 @@ var useCallAction = () => {
       context
     }) => {
       try {
-        const stableEnvContext = (0, import_react.useMemo)(
-          () => env?.context,
-          [env?.context?.lang]
-        );
         const menuContext = {
-          ...stableEnvContext,
+          ...env?.context,
           ...context
         };
         const loadRes = await queryLoadAction.mutateAsync({
@@ -6627,10 +6623,14 @@ var tableGroupController = (props) => {
 };
 
 // src/widget/advance/search/controller.ts
-var import_constants3 = require("@fctc/interface-logic/constants");
-var import_utils20 = require("@fctc/interface-logic/utils");
 var import_moment2 = __toESM(require_moment());
 var import_react26 = require("react");
+
+// src/constants.ts
+var constants_exports = {};
+__reExport(constants_exports, require("@fctc/interface-logic/constants"));
+
+// src/widget/advance/search/controller.ts
 var searchController = ({
   viewData,
   model,
@@ -6645,9 +6645,11 @@ var searchController = ({
   const [selectedTags, setSelectedTags] = (0, import_react26.useState)(null);
   const [searchString, setSearchString] = (0, import_react26.useState)("");
   const [searchMap, setSearchMap] = (0, import_react26.useState)({});
-  const actionContext = typeof context === "string" ? (0, import_utils20.evalJSONContext)(context) : context;
+  const [hoveredIndex, setHoveredIndex] = (0, import_react26.useState)(0);
+  const [hoveredIndexSearchList, setHoveredIndexSearchList] = (0, import_react26.useState)(0);
+  const actionContext = typeof context === "string" ? (0, utils_exports.evalJSONContext)(context) : context;
   const contextSearch = { ...env.context, ...actionContext };
-  const domainAction = domain ? Array.isArray(domain) ? [...domain] : (0, import_utils20.evalJSONDomain)(domain, contextSearch) : [];
+  const domainAction = domain ? Array.isArray(domain) ? [...domain] : (0, utils_exports.evalJSONDomain)(domain, contextSearch) : [];
   const clearSearch = () => {
     setFilterBy([]);
     setGroupBy([]);
@@ -6662,23 +6664,23 @@ var searchController = ({
         const dataModel = viewData?.models?.[model];
         const searchViews = viewData?.views?.search;
         const searchByItems = searchViews?.search_by?.filter(
-          (item) => !import_utils20.domainHelper.matchDomains(contextSearch, item.invisible)
+          (item) => !utils_exports.domainHelper.matchDomains(contextSearch, item.invisible)
         )?.map(
           ({ string, name, filter_domain, operator, widget }, index) => ({
             dataIndex: index,
-            title: string ?? dataModel[name]?.string,
-            name: name ?? dataModel[name]?.name,
+            title: string ?? dataModel?.[name]?.string,
+            name: name ?? dataModel?.[name]?.name,
             filter_domain,
             operator,
             widget,
-            type: dataModel[name]?.type
+            type: dataModel?.[name]?.type
           })
         );
         const filterByItems = searchViews?.filter_by.filter((item) => {
-          return !import_utils20.domainHelper.matchDomains(contextSearch, item?.invisible);
+          return !utils_exports.domainHelper.matchDomains(contextSearch, item?.invisible);
         })?.map((item) => ({ ...item, active: false }));
         const groupByItems = searchViews?.group_by.filter(
-          (item) => !import_utils20.domainHelper.matchDomains(contextSearch, item?.invisible)
+          (item) => !utils_exports.domainHelper.matchDomains(contextSearch, item?.invisible)
         ).map((item) => ({
           ...item,
           string: item.string ?? viewData?.models?.[model]?.[item?.name?.split("group_by_")?.[1]]?.string
@@ -6732,7 +6734,7 @@ var searchController = ({
     if (domainAction) {
       const domain2 = [];
       if (Array.isArray(domainAction) && domainAction.length > 0) {
-        if (Object.keys(searchMap).some((key) => !key.includes(import_constants3.SearchType.GROUP))) {
+        if (Object.keys(searchMap).some((key) => !key.includes(constants_exports.SearchType.GROUP))) {
           domain2.push("&");
         }
         domainAction.forEach((domainItem) => {
@@ -6740,7 +6742,7 @@ var searchController = ({
         });
       }
       Object.keys(searchMap).forEach((key, keyIndex, keys) => {
-        if (!key?.includes(import_constants3.SearchType.GROUP)) {
+        if (!key?.includes(constants_exports.SearchType.GROUP)) {
           if (keys.length > 1 && keyIndex < keys.length - 1) {
             domain2.push("&");
           }
@@ -6755,14 +6757,14 @@ var searchController = ({
             }
             let valueDomainItem = value?.value;
             if (value?.modelType === "date") {
-              valueDomainItem = (0, import_utils20.validateAndParseDate)(value?.value);
+              valueDomainItem = (0, utils_exports.validateAndParseDate)(value?.value);
             } else if (value?.modelType === "datetime") {
               if (value?.operator === "<=" || value?.operator === "<") {
-                const parsedDate = (0, import_utils20.validateAndParseDate)(value?.value, true);
+                const parsedDate = (0, utils_exports.validateAndParseDate)(value?.value, true);
                 const hasTime = (0, import_moment2.default)(value?.value).format("HH:mm:ss") !== "00:00:00";
                 valueDomainItem = hasTime ? (0, import_moment2.default)(parsedDate).format("YYYY-MM-DD HH:mm:ss") : (0, import_moment2.default)(parsedDate).add(1, "day").subtract(1, "second").format("YYYY-MM-DD HH:mm:ss");
               } else {
-                valueDomainItem = (0, import_utils20.validateAndParseDate)(value?.value, true);
+                valueDomainItem = (0, utils_exports.validateAndParseDate)(value?.value, true);
               }
             }
             const operator = value?.modelType === "date" || value?.modelType === "datetime" || value?.modelType === "boolean" || value?.modelType === "integer" ? value?.operator ?? "=" : value.operator ?? "ilike";
@@ -6787,11 +6789,11 @@ var searchController = ({
             modelType,
             dataIndex
           } = objValues[0];
-          if (!key?.includes(import_constants3.SearchType.GROUP)) {
+          if (!key?.includes(constants_exports.SearchType.GROUP)) {
             const values = objValues?.map((objValue) => objValue.value);
             return {
               title,
-              name: type === import_constants3.SearchType.SEARCH ? `${import_constants3.SearchType.SEARCH}_${String(dataIndex)}` : groupIndex ?? name,
+              name: type === constants_exports.SearchType.SEARCH ? `${constants_exports.SearchType.SEARCH}_${String(dataIndex)}` : groupIndex ?? name,
               values,
               type,
               widget,
@@ -6841,22 +6843,22 @@ var searchController = ({
   }, [searchMap]);
   const handleAddTagSearch = (tag) => {
     const { domain: domain2, groupIndex, value, type, context: context2, dataIndex } = tag;
-    const domainFormat = new import_utils20.domainHelper.Domain(domain2);
-    if (type === import_constants3.SearchType.FILTER) {
-      addSearchItems(`${import_constants3.SearchType.FILTER}_${groupIndex}`, {
+    const domainFormat = new utils_exports.domainHelper.Domain(domain2);
+    if (type === constants_exports.SearchType.FILTER) {
+      addSearchItems(`${constants_exports.SearchType.FILTER}_${groupIndex}`, {
         ...tag,
         domain: domain2 ? domainFormat.toList(context2) : null
       });
-    } else if (type === import_constants3.SearchType.SEARCH) {
-      addSearchItems(`${import_constants3.SearchType.SEARCH}_${String(dataIndex)}`, {
+    } else if (type === constants_exports.SearchType.SEARCH) {
+      addSearchItems(`${constants_exports.SearchType.SEARCH}_${String(dataIndex)}`, {
         ...tag,
         domain: domain2 ? domainFormat.toList({
           ...context2,
           self: value
         }) : null
       });
-    } else if (type === import_constants3.SearchType.GROUP) {
-      addSearchItems(`${import_constants3.SearchType.GROUP}`, {
+    } else if (type === constants_exports.SearchType.GROUP) {
+      addSearchItems(`${constants_exports.SearchType.GROUP}`, {
         ...tag,
         domain: domain2 ? domainFormat.toList({
           context: context2,
@@ -6865,6 +6867,65 @@ var searchController = ({
       });
     }
   };
+  const onKeyDown = (e) => {
+    if (!searchBy || searchBy.length === 0) return;
+    switch (e.key) {
+      case "Backspace": {
+        if (!searchString && selectedTags && selectedTags.length > 0) {
+          const lastTag = selectedTags[selectedTags.length - 1];
+          if (!lastTag) return;
+          const key = lastTag.type === constants_exports.SearchType.GROUP ? constants_exports.SearchType.GROUP : lastTag.name;
+          removeKeyFromSearchMap({ key: String(key) });
+        }
+        break;
+      }
+      case "ArrowDown": {
+        e.preventDefault();
+        setHoveredIndex((prev) => {
+          const maxIndex = searchBy.length - 1;
+          const next = prev < maxIndex ? prev + 1 : prev;
+          setHoveredIndexSearchList(next);
+          return next;
+        });
+        break;
+      }
+      case "ArrowUp": {
+        e.preventDefault();
+        setHoveredIndex((prev) => {
+          const next = prev > 0 ? prev - 1 : prev;
+          setHoveredIndexSearchList(next);
+          return next;
+        });
+        break;
+      }
+      case "Enter": {
+        e.preventDefault();
+        if (!searchString.trim()) return;
+        const head = searchBy[hoveredIndex];
+        if (!head) return;
+        handleAddTagSearch({
+          title: head.title,
+          name: head.name,
+          value: searchString,
+          type: constants_exports.SearchType.SEARCH,
+          domain: head.filter_domain,
+          operator: head.operator,
+          dataIndex: head.dataIndex,
+          widget: head.widget,
+          modelType: head.type
+        });
+        break;
+      }
+      default:
+        break;
+    }
+  };
+  const handleMouseEnter = (index) => {
+    setHoveredIndexSearchList(index);
+  };
+  const handleMouseLeave = () => {
+    setHoveredIndexSearchList(null);
+  };
   return {
     groupBy,
     searchBy,
@@ -6880,7 +6941,11 @@ var searchController = ({
     onSearchString: onChangeSearchInput,
     handleAddTagSearch,
     domain: formatDomain(),
-    context: contextSearch
+    context: contextSearch,
+    onKeyDown,
+    handleMouseEnter,
+    handleMouseLeave,
+    hoveredIndexSearchList
   };
 };
 
@@ -6893,12 +6958,6 @@ __reExport(store_exports, require("@fctc/interface-logic/store"));
 
 // src/index.ts
 __reExport(index_exports, store_exports, module.exports);
-
-// src/constants.ts
-var constants_exports = {};
-__reExport(constants_exports, require("@fctc/interface-logic/constants"));
-
-// src/index.ts
 __reExport(index_exports, constants_exports, module.exports);
 
 // src/environment.ts