shineout 3.6.0-beta.1 → 3.6.0-beta.2

package/cjs/index.js

@@ -507,5 +507,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.6.0-beta.1'
+  version: '3.6.0-beta.2'
 };

package/dist/shineout.js

@@ -12040,7 +12040,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.6.0-beta.1');
+/* harmony default export */ var version = ('3.6.0-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -21467,7 +21467,8 @@ var setToken = function setToken(options) {
     _ref$selector = _ref.selector,
     selector = _ref$selector === void 0 ? 'body' : _ref$selector,
     target = _ref.target,
-    tokenName = _ref.tokenName,
+    _ref$tokenName = _ref.tokenName,
+    tokenName = _ref$tokenName === void 0 ? 'shineout-token' : _ref$tokenName,
     token = _ref.token,
     attributes = _ref.attributes,
     onlyExtra = _ref.onlyExtra,
@@ -21476,7 +21477,7 @@ var setToken = function setToken(options) {
   var _getConfig = getConfig(),
     prefix = _getConfig.prefix;
   if (typeof window === 'undefined') return;
-  var id = "__shineoutThemeStyleContainer__".concat(createHash(selector));
+  var id = "shineout-next-token-".concat(createHash(selector));
   var cacheTag = document.querySelector("[data-token-id=\"".concat(id, "\"]"));
   var tag = cacheTag || document.createElement(tagName);
   var tokens = [];
@@ -21599,8 +21600,6 @@ var scopeNormalizeStyle = function scopeNormalizeStyle() {
   appendNormalizeStyle(scopedStyleString, uniqueStyleId);
 };
 token_setter({
-  onlyExtra: true,
-  tokenName: 'shineout-extra',
   selector: 'html'
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/pagination/pagination.ts
@@ -29679,7 +29678,7 @@ var usePositionStyle = function usePositionStyle(config) {
       style: hideStyle
     };
     var rect = context.parentRect;
-    if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+    if (!show && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
       var _scrollElRef$current2;
       var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom || rect.right < visibleRect.left || rect.left > visibleRect.right) {
@@ -36581,19 +36580,13 @@ var getFilterTree = function getFilterTree(treeNodes, filterFunc, filterExpandKe
     return node;
   });
 };
-var mergeFilteredTree = function mergeFilteredTree(filterDatum, rawDatum, tiledId) {
-  var filterData = filterDatum.data;
-  var childrenKey = filterDatum.childrenKey;
+var mergeFilteredTree = function mergeFilteredTree(filterData, rawDatum, tiledId) {
+  var childrenKey = rawDatum.childrenKey;
   if (tiledId.length === 0) return filterData;
   var recursion = function recursion(node) {
-    var nodeKey = filterDatum.getKey(node);
+    var nodeKey = rawDatum.getKey(node);
     if (tiledId.indexOf(nodeKey) >= 0) {
       node[childrenKey] = deepClone(rawDatum.getDataById(nodeKey)[childrenKey] || []);
-    } else {
-      var item = filterDatum.getDataById(nodeKey);
-      if (item && item[childrenKey]) {
-        node[childrenKey] = deepClone(item[childrenKey] || []);
-      }
     }
     var children = node[childrenKey] || [];
     children.map(recursion);
@@ -36767,6 +36760,7 @@ function use_tree_toArray(value) {
   if (!Array.isArray(value)) return [value];
   return value;
 }
+var global_tree_map = new Map();
 var MODE = {
   /**
    * 返回全选数据，包含父节点和子节点
@@ -37086,6 +37080,15 @@ var useTree = function useTree(props) {
     return 2;
   };
   var setData = function setData(data) {
+    // if(data && global_tree_map.get(data)){
+    //   context.cachedValue = global_tree_map.get(data)?.cachedValue || []
+    //   context.pathMap = global_tree_map.get(data)?.pathMap || new Map()
+    //   context.dataMap = global_tree_map.get(data)?.dataMap || new Map()
+    //   context.valueMap = global_tree_map.get(data)?.valueMap || new Map()
+    //   context.unmatchedValueMap = global_tree_map.get(data)?.unmatchedValueMap || new Map()
+    //   return
+    // }
+
     var prevValue = context.value || [];
     context.cachedValue = [];
     context.pathMap = new Map();
@@ -37097,6 +37100,8 @@ var useTree = function useTree(props) {
     initData(context.data, []);
     initValue();
     setValue(prevValue);
+
+    // global_tree_map.set(data, context)
   };
   var set = function set(id, checked, direction) {
     if (!isDisabled(id)) {
@@ -50951,7 +50956,7 @@ var usePaginationList = function usePaginationList(props) {
 
 
 var useTiled = function useTiled(props) {
-  var data = props.data,
+  var filterData = props.data,
     keygen = props.keygen,
     _props$childrenKey = props.childrenKey,
     childrenKey = _props$childrenKey === void 0 ? 'children' : _props$childrenKey,
@@ -50968,19 +50973,19 @@ var useTiled = function useTiled(props) {
     tileds = _useState2[0],
     setTileds = _useState2[1];
   var _useTree = use_tree({
-      data: data,
-      childrenKey: childrenKey,
-      keygen: keygen,
-      isControlled: false
-    }),
-    datum = _useTree.datum;
-  var _useTree2 = use_tree({
       data: rawData,
+      datum: props.rawDatum,
       childrenKey: childrenKey,
       keygen: keygen,
       isControlled: false
     }),
-    rawDatum = _useTree2.datum;
+    rawDatum = _useTree.datum;
+  if (!filterText || !onAdvancedFilter) {
+    return {
+      data: filterData,
+      onFilter: onFilter
+    };
+  }
   var handleToggle = function handleToggle(e, key) {
     e.stopPropagation();
     var nextTileds = toConsumableArray_default()(tileds);
@@ -51012,13 +51017,7 @@ var useTiled = function useTiled(props) {
       children: moreIcon()
     });
   };
-  if (!filterText || !onAdvancedFilter) {
-    return {
-      data: data,
-      onFilter: onFilter
-    };
-  }
-  var nextData = mergeFilteredTree(datum, rawDatum, tileds);
+  var nextData = mergeFilteredTree(filterData, rawDatum, tileds);
   return {
     data: nextData,
     onFilter: handleFilter,
@@ -61500,10 +61499,6 @@ var TabsHeader = function TabsHeader(props) {
     sticky = props.sticky;
   var headerRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var scrollRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
-    _useState2 = slicedToArray_default()(_useState, 2),
-    loaded = _useState2[0],
-    setLoaded = _useState2[1];
   var tabRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
   var _useTabsContext = useTabsContext(),
     shape = _useTabsContext.shape,
@@ -61512,11 +61507,6 @@ var TabsHeader = function TabsHeader(props) {
     active = _useTabsContext.active;
   var config = useConfig();
   var isRtl = config.direction === 'rtl';
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (sticky && headerRef.current && scrollRef.current && !loaded) {
-      setLoaded(true);
-    }
-  }, [loaded, sticky]);
   var _useTransform = use_transform({
       autoScroll: true,
       direction: isVertical ? 'Y' : 'X',
@@ -61578,17 +61568,17 @@ var TabsHeader = function TabsHeader(props) {
     var single = isRtl && !isVertical ? -1 : 1;
     setTransform(delta + headerRef.current.clientWidth * single);
   };
-  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
       offsetTop: 0,
       offsetLeft: 0
     }),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    currentTabOffset = _useState2[0],
+    setCurrentTabOffset = _useState2[1];
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(null),
     _useState4 = slicedToArray_default()(_useState3, 2),
-    currentTabOffset = _useState4[0],
-    setCurrentTabOffset = _useState4[1];
-  var _useState5 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(null),
-    _useState6 = slicedToArray_default()(_useState5, 2),
-    currentTabRect = _useState6[0],
-    setCurrentTabRect = _useState6[1];
+    currentTabRect = _useState4[0],
+    setCurrentTabRect = _useState4[1];
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     var _currentTab$getBoundi;
     if (shape !== 'line' && shape !== 'dash') return;
@@ -63160,7 +63150,8 @@ var TreeSelect = function TreeSelect(props0) {
       childrenKey: childrenKey,
       expanded: expanded,
       rawData: rawData,
-      onFilter: onFilter
+      onFilter: onFilter,
+      rawDatum: datum
     }),
     tiledData = _useTiled.data,
     onTiledFilter = _useTiled.onFilter,
@@ -63187,6 +63178,15 @@ var TreeSelect = function TreeSelect(props0) {
     closePop = _usePopup.closePop,
     PopupProvider = _usePopup.Provider,
     popupProviderValue = _usePopup.providerValue;
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+    _useState4 = slicedToArray_default()(_useState3, 2),
+    hadOpened = _useState4[0],
+    setHadOpened = _useState4[1];
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (open) {
+      setHadOpened(true);
+    }
+  }, [open]);
   var tipNode = use_tip({
     popover: props.popover,
     popoverProps: props.popoverProps,
@@ -63442,6 +63442,7 @@ var TreeSelect = function TreeSelect(props0) {
         filterText: filterText,
         onFilter: handleFilter,
         onRef: inputRef,
+        inputRef: inputRef,
         checkUnMatched: checkUnMatched,
         onClearCreatedData: onClearCreatedData,
         getDataByValues: getResultByValue,
@@ -63561,7 +63562,7 @@ var TreeSelect = function TreeSelect(props0) {
     onBlur: handleBlur,
     onFocus: handleFocus,
     onKeyDown: handleKeyDown,
-    children: [tipNode, renderResult(), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
+    children: [tipNode, renderResult(), hadOpened && /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
       adjust: adjust,
       focus: open,
       fixedWidth: "min",
@@ -67191,7 +67192,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.1'
+  version: '3.6.0-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;