diginet-core-ui 1.4.50-beta.3 → 1.4.50-beta.5

package/components/form-control/dropdown/index.js

@@ -330,19 +330,21 @@ const Dropdown = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
     let dataSourceUsable = [...dataSourceState];
 
     // search dataSource dựa trên txtSearch
-    if (!onInput || action !== null && action !== void 0 && action.loadData) {
-      var _dataSourceUsable;
-      dataSourceUsable = (_dataSourceUsable = dataSourceUsable) === null || _dataSourceUsable === void 0 ? void 0 : _dataSourceUsable.filter(i => {
-        if (searchExpr) {
-          // nếu map đc vs 1 trong những <key>(data[key]) của searchExpr
-          return !!searchExpr.find(j => handleRenderBySearch(i[j]));
-        } else {
-          // nếu map đc vs displayValue
-          return handleRenderBySearch(displayValue(i)) || handleRenderBySearch(i === null || i === void 0 ? void 0 : i[valueExpr]);
-        }
-      });
+    if (!onInput) {
+      if (!(action !== null && action !== void 0 && action.loadData) || !onLoadMore) {
+        var _dataSourceUsable;
+        dataSourceUsable = (_dataSourceUsable = dataSourceUsable) === null || _dataSourceUsable === void 0 ? void 0 : _dataSourceUsable.filter(i => {
+          if (searchExpr) {
+            // nếu map đc vs 1 trong những <key>(data[key]) của searchExpr
+            return !!searchExpr.find(j => handleRenderBySearch(i[j]));
+          } else {
+            // nếu map đc vs displayValue
+            return handleRenderBySearch(displayValue(i)) || handleRenderBySearch(i === null || i === void 0 ? void 0 : i[valueExpr]);
+          }
+        });
+      }
     }
-    if (vlObjDefaultState && vlObjDefaultState !== null && vlObjDefaultState !== void 0 && vlObjDefaultState.length) {
+    if (vlObjDefaultState && (vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length) > 0) {
       const length = vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length;
       let existItemQuantity = 0;
       for (let index = length - 1; index >= 0; index--) {
@@ -457,7 +459,8 @@ const Dropdown = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
       parentID: treeViewParentID,
       value: typeof currentValue[unique] === 'string' ? [currentValue[unique]] : currentValue[unique],
       onChange: (e, value) => onChangeValue(e, '', multiple ? value : e.value),
-      renderItem: renderItem
+      renderItem: renderItem,
+      isInDropdown: true
     }) : EmptyDataText);
   };
 

package/components/tree-view/index.js

@@ -37,6 +37,7 @@ const TreeView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
     expand,
     expandIcon,
     id,
+    isInDropdown,
     multiple,
     multipleValueMode,
     onChange,
@@ -69,7 +70,7 @@ const TreeView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
     allowNumber: false,
     allowSymbol: false
   }));
-  const _TreeViewRootCSS = TreeViewRootCSS(theme);
+  const _TreeViewRootCSS = TreeViewRootCSS(theme, isInDropdown);
   const determinateCheckbox = (input, determinate) => {
     if (multipleValueMode === 'multiple' || disabledRelevantValue) {
       input.classList[determinate ? 'add' : 'remove']('determinate');
@@ -793,7 +794,7 @@ const TreeView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
 const TreeViewRootCSS = ({
   colors,
   spacing
-}) => css`
+}, isInDropdown) => css`
     ${displayBlock};
     ${positionRelative};
     .DGN-UI-Accordion {
@@ -833,7 +834,7 @@ const TreeViewRootCSS = ({
     .TreeView-Content {
         ${displayBlock};
         ${positionRelative};
-        ${parseMaxHeight(240)};
+        ${isInDropdown && parseMaxHeight(240)};
         ${overflowYScroll};
         &::-webkit-scrollbar {
             ${borderRadius(4)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.4.50-beta.3",
+  "version": "1.4.50-beta.5",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",