@zidian-primitive/cascader 0.3.0 → 0.3.1

package/esm/hooks/useCascader.js

@@ -40,11 +40,13 @@ function useCascader(options) {
       sourceNodeData2.find((node) => showConfig.depth === node.depth && node[showConfig.showType] === value)
     );
   }, [showConfig]);
-  const isControlled = useMemo(() => pathOption?.showValue || pathOption?.showValue === 0, [pathOption?.showValue]);
-  const initialPath = useMemo(() => getPathByOption(
-    sourceNodeData,
-    pathOption?.showValue ?? pathOption?.defaultShowValue
-  ), [sourceNodeData, pathOption?.defaultShowValue, pathOption?.showValue]);
+  const isControlled = useMemo(() => pathOption?.showValue || pathOption?.showValue === 0 || pathOption?.showValue === "", [pathOption?.showValue]);
+  const initialPath = useMemo(() => {
+    return getPathByOption(
+      sourceNodeData,
+      pathOption?.showValue ?? pathOption?.defaultShowValue
+    );
+  }, [sourceNodeData, pathOption?.defaultShowValue, pathOption?.showValue]);
   const initialSelected = useMemo(() => new Set(
     selectOption?.selected ?? selectOption?.defaultSelected
   ), [selectOption?.selected, selectOption?.defaultSelected]);
@@ -55,19 +57,19 @@ function useCascader(options) {
   const [internalPath, setInternalPath] = useState(initialPath);
   const [internalSelected, setInternalSelected] = useState(initialSelected);
   const [checkStatusArray, setCheckStatusArray] = useState(initialStatusArray);
-  const path = useMemo(() => isControlled ? initialPath : internalPath, [sourceNodeData, internalPath, isControlled]);
-  const columns = useMemo(() => getCascadeColumns(sourceNodeData, path), [sourceNodeData, initialPath, path]);
+  const path = useMemo(() => isControlled ? initialPath : internalPath, [internalPath, isControlled]);
+  const columns = useMemo(() => getCascadeColumns(sourceNodeData, path), [sourceNodeData, path]);
   const handleChangePath = useCallback((depth, index) => {
     if (pathOption?.onShowValueChange && depth === showConfig.depth) {
       pathOption.onShowValueChange(sourceNodeData[index][showConfig.showType], depth);
     }
-    if (pathOption?.showValue !== 0 && !pathOption?.showValue) {
+    if (!isControlled) {
       setInternalPath(changeShowPath(
         sourceNodeData,
         { oldPath: path, action: { depth, nodeIdx: index } }
       ));
     }
-  }, [pathOption, sourceNodeData]);
+  }, [pathOption, sourceNodeData, isControlled]);
   const handleChangeCheckStatus = useCallback((nodeIdx, checkStatus) => {
     if (selectOption) {
       if (selectOption?.selected) {

package/esm/utils/data.js

@@ -89,7 +89,7 @@ function getShowPath(nodes, targetNode) {
     }
     while (childNode) {
       showPath[childNode.depth] = childNode.index;
-      childNode = childNode.childrenIndices[0] ? childNode : null;
+      childNode = childNode.childrenIndices[0] ? nodes[childNode.childrenIndices[0]] : null;
     }
     return showPath;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zidian-primitive/cascader",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "./src/index.ts",
   "license": "MIT",
   "type": "module",