@canlooks/can-ui 0.0.200 → 0.0.201

package/dist/cjs/components/cascade/cascade.js

@@ -76,7 +76,6 @@ loading, options, labelKey = 'label', primaryKey = 'value', childrenKey = 'child
         if ((0, utils_1.isNoValue)(value)) {
             return [];
         }
-        console.log(142, value.slice(0, -1));
         return value.slice(0, -1);
     });
     const toggleOpenedPanels = (value, index) => {
@@ -132,6 +131,7 @@ loading, options, labelKey = 'label', primaryKey = 'value', childrenKey = 'child
     };
     const actualOptions = innerOptions || options;
     const { value: innerValue, setValue: setInnerValue, toggleSelected, selectionStatus, optionsMap } = (0, selectionContext_1.useSelection)({
+        standalone: true,
         options: actualOptions,
         multiple,
         value: toStandardValue(pathifiedValue.current),

package/dist/cjs/components/selectionContext/selectionContext.d.ts

@@ -32,6 +32,8 @@ export type SelectionContextBaseProps<O extends OptionType<V>, V extends Id = Id
     disabled?: boolean;
     onToggle?(checked: boolean, value: V, option?: O): void;
     children?: ReactNode;
+    /** 若设为true，则该Context不受父级Context影响，默认为`false` */
+    standalone?: boolean;
 };
 export type ISelectionContext<O extends OptionType<V>, V extends Id = Id> = {
     inSelection: true;

package/dist/cjs/components/selectionContext/selectionHook.js

@@ -19,15 +19,12 @@ function useSelection({ ...props }) {
      * 若嵌套在另个一SelectionContext内，取最外层数据
      */
     const context = (0, selectionContext_1.useSelectionContext)();
-    if (context.inSelection) {
+    if (!props.standalone && context.inSelection) {
         innerValue.current = context.value;
         setInnerValue = context.setValue;
         innerOptions.current = context.options;
     }
-    const optionsMap = (0, react_1.useMemo)(() => {
-        if (context.inSelection) {
-            return context.optionsMap;
-        }
+    const _optionsMap = (0, react_1.useMemo)(() => {
         const map = new Map();
         const fn = (arr, parentId) => {
             // 有时arr可能不为数组，需要判断，如DataGrid组件的row.children
@@ -41,7 +38,8 @@ function useSelection({ ...props }) {
         };
         fn(innerOptions.current);
         return map;
-    }, [innerOptions.current, props.primaryKey, props.childrenKey, context.optionsMap]);
+    }, [innerOptions.current, props.primaryKey, props.childrenKey]);
+    const optionsMap = !props.standalone && context.inSelection ? context.optionsMap : _optionsMap;
     const syncOptionsMap = (0, utils_1.useSync)(optionsMap);
     const syncProps = (0, utils_1.useSync)(props);
     const calSelectionStatus = (selectedSet = new Set((0, utils_1.toArray)(innerValue.current))) => {
@@ -84,21 +82,15 @@ function useSelection({ ...props }) {
         return map;
     };
     const preCalSelectionStatus = (0, react_1.useRef)(void 0);
-    const selectionStatus = (0, react_1.useMemo)(() => {
-        if (context.inSelection) {
-            return context.selectionStatus;
-        }
+    const _selectionStatus = (0, react_1.useMemo)(() => {
         // 调用toggleSelected()方法后可能会预先计算selectionStatus
         const ret = preCalSelectionStatus.current || calSelectionStatus();
         preCalSelectionStatus.current = void 0;
         return ret;
-    }, [innerValue.current, optionsMap, props.multiple, props.relation, context.selectionStatus]);
+    }, [innerValue.current, optionsMap, props.multiple, props.relation]);
+    const selectionStatus = !props.standalone && context.inSelection ? context.selectionStatus : _selectionStatus;
     const syncSelectionStatus = (0, utils_1.useSync)(selectionStatus);
-    const toggleSelected = (0, react_1.useCallback)((value) => {
-        if (context.inSelection) {
-            context.toggleSelected(value);
-            return;
-        }
+    const _toggleSelected = (0, react_1.useCallback)((value) => {
         if (syncProps.current.disabled) {
             return;
         }
@@ -190,7 +182,8 @@ function useSelection({ ...props }) {
                 children && loopOptions(callback, children, ret);
             });
         }
-    }, [context.inSelection]);
+    }, []);
+    const toggleSelected = !props.standalone && context.inSelection ? context.toggleSelected : _toggleSelected;
     return {
         inSelection: true,
         multiple: props.multiple,

package/dist/cjs/components/treeSelect/treeSelect.js

@@ -39,6 +39,7 @@ value, onChange, renderBackfill, ...props }) => {
         return fn(react_1.Children.toArray(children));
     }, [options, nodes, children]);
     const { value: innerValue, setValue: setInnerValue, toggleSelected, optionsMap } = (0, selectionContext_1.useSelection)({
+        standalone: true,
         options: actualOptions,
         primaryKey,
         childrenKey,

package/dist/esm/components/cascade/cascade.js

@@ -72,7 +72,6 @@ loading, options, labelKey = 'label', primaryKey = 'value', childrenKey = 'child
         if (isNoValue(value)) {
             return [];
         }
-        console.log(142, value.slice(0, -1));
         return value.slice(0, -1);
     });
     const toggleOpenedPanels = (value, index) => {
@@ -128,6 +127,7 @@ loading, options, labelKey = 'label', primaryKey = 'value', childrenKey = 'child
     };
     const actualOptions = innerOptions || options;
     const { value: innerValue, setValue: setInnerValue, toggleSelected, selectionStatus, optionsMap } = useSelection({
+        standalone: true,
         options: actualOptions,
         multiple,
         value: toStandardValue(pathifiedValue.current),

package/dist/esm/components/selectionContext/selectionContext.d.ts

@@ -32,6 +32,8 @@ export type SelectionContextBaseProps<O extends OptionType<V>, V extends Id = Id
     disabled?: boolean;
     onToggle?(checked: boolean, value: V, option?: O): void;
     children?: ReactNode;
+    /** 若设为true，则该Context不受父级Context影响，默认为`false` */
+    standalone?: boolean;
 };
 export type ISelectionContext<O extends OptionType<V>, V extends Id = Id> = {
     inSelection: true;

package/dist/esm/components/selectionContext/selectionHook.js

@@ -15,15 +15,12 @@ export function useSelection({ ...props }) {
      * 若嵌套在另个一SelectionContext内，取最外层数据
      */
     const context = useSelectionContext();
-    if (context.inSelection) {
+    if (!props.standalone && context.inSelection) {
         innerValue.current = context.value;
         setInnerValue = context.setValue;
         innerOptions.current = context.options;
     }
-    const optionsMap = useMemo(() => {
-        if (context.inSelection) {
-            return context.optionsMap;
-        }
+    const _optionsMap = useMemo(() => {
         const map = new Map();
         const fn = (arr, parentId) => {
             // 有时arr可能不为数组，需要判断，如DataGrid组件的row.children
@@ -37,7 +34,8 @@ export function useSelection({ ...props }) {
         };
         fn(innerOptions.current);
         return map;
-    }, [innerOptions.current, props.primaryKey, props.childrenKey, context.optionsMap]);
+    }, [innerOptions.current, props.primaryKey, props.childrenKey]);
+    const optionsMap = !props.standalone && context.inSelection ? context.optionsMap : _optionsMap;
     const syncOptionsMap = useSync(optionsMap);
     const syncProps = useSync(props);
     const calSelectionStatus = (selectedSet = new Set(toArray(innerValue.current))) => {
@@ -80,21 +78,15 @@ export function useSelection({ ...props }) {
         return map;
     };
     const preCalSelectionStatus = useRef(void 0);
-    const selectionStatus = useMemo(() => {
-        if (context.inSelection) {
-            return context.selectionStatus;
-        }
+    const _selectionStatus = useMemo(() => {
         // 调用toggleSelected()方法后可能会预先计算selectionStatus
         const ret = preCalSelectionStatus.current || calSelectionStatus();
         preCalSelectionStatus.current = void 0;
         return ret;
-    }, [innerValue.current, optionsMap, props.multiple, props.relation, context.selectionStatus]);
+    }, [innerValue.current, optionsMap, props.multiple, props.relation]);
+    const selectionStatus = !props.standalone && context.inSelection ? context.selectionStatus : _selectionStatus;
     const syncSelectionStatus = useSync(selectionStatus);
-    const toggleSelected = useCallback((value) => {
-        if (context.inSelection) {
-            context.toggleSelected(value);
-            return;
-        }
+    const _toggleSelected = useCallback((value) => {
         if (syncProps.current.disabled) {
             return;
         }
@@ -186,7 +178,8 @@ export function useSelection({ ...props }) {
                 children && loopOptions(callback, children, ret);
             });
         }
-    }, [context.inSelection]);
+    }, []);
+    const toggleSelected = !props.standalone && context.inSelection ? context.toggleSelected : _toggleSelected;
     return {
         inSelection: true,
         multiple: props.multiple,

package/dist/esm/components/treeSelect/treeSelect.js

@@ -36,6 +36,7 @@ value, onChange, renderBackfill, ...props }) => {
         return fn(Children.toArray(children));
     }, [options, nodes, children]);
     const { value: innerValue, setValue: setInnerValue, toggleSelected, optionsMap } = useSelection({
+        standalone: true,
         options: actualOptions,
         primaryKey,
         childrenKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canlooks/can-ui",
-  "version": "0.0.200",
+  "version": "0.0.201",
   "author": "C.CanLiang <canlooks@gmail.com>",
   "description": "My ui framework",
   "license": "MIT",