@pisell/private-materials 6.11.55 → 6.11.56

package/es/components/list/hooks/useListState.js

@@ -11,6 +11,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useReducer, useCallback, useEffect, useRef } from 'react';
+import { useMemoizedFn } from 'ahooks';
 
 // 状态接口
 
@@ -65,28 +66,30 @@ export var useListState = function useListState(_ref) {
   // 用 ref 追踪最新的 activeTab，避免将 state.activeTab 加入 useEffect 依赖导致循环触发
   var activeTabRef = useRef(initialState.activeTab);
   activeTabRef.current = state.activeTab;
-  useEffect(function () {
-    debugger;
-    if (!isTreeTab) {
-      setActiveTab(['0']);
-      return;
+
+  /** 判断当前 activeTab 的首层 key 是否仍存在于 tabItems 中 */
+  var isActiveTabValid = useMemoizedFn(function (items) {
+    var current = activeTabRef.current;
+    var key = Array.isArray(current) ? current[0] : current;
+    return !!key && items.some(function (tab) {
+      return tab.key == key;
+    });
+  });
+
+  /** 根据 tabItems 计算默认的 activeTab */
+  var getDefaultTab = useMemoizedFn(function (items, tree) {
+    var _items$;
+    if (!tree) return ['0'];
+    var defaultTab = [items[0].key];
+    if (((_items$ = items[0]) === null || _items$ === void 0 || (_items$ = _items$.children) === null || _items$ === void 0 ? void 0 : _items$.length) > 0) {
+      defaultTab.push('0');
     }
-    if (tabStyle === 'switch' && tabItems.length > 0) {
-      var _tabItems$;
-      // 取当前 activeTab 的首层 key 判断是否仍存在于新的 tabItems 中
-      var currentActive = activeTabRef.current;
-      var currentActiveKey = Array.isArray(currentActive) ? currentActive[0] : currentActive;
-      var isCurrentTabStillValid = currentActiveKey && tabItems.some(function (tab) {
-        return tab.key == currentActiveKey;
-      });
-      if (isCurrentTabStillValid) {
-        return;
-      }
-      var defaultTab = [tabItems[0].key];
-      if (((_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 || (_tabItems$ = _tabItems$.children) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.length) > 0) {
-        defaultTab.push('0');
-      }
-      setActiveTab(defaultTab);
+    return defaultTab;
+  });
+  useEffect(function () {
+    if (!isTreeTab || tabStyle === 'switch' && tabItems.length > 0) {
+      if (isActiveTabValid(tabItems)) return;
+      setActiveTab(getDefaultTab(tabItems, isTreeTab));
     }
   }, [tabItems, isTreeTab]);
 

package/lib/components/list/hooks/useListState.js

@@ -23,6 +23,7 @@ __export(useListState_exports, {
 });
 module.exports = __toCommonJS(useListState_exports);
 var import_react = require("react");
+var import_ahooks = require("ahooks");
 function listStateReducer(state, action) {
   switch (action.type) {
     case "SET_ACTIVE_TAB":
@@ -53,25 +54,24 @@ var useListState = ({
   const [state, dispatch] = (0, import_react.useReducer)(listStateReducer, initialState);
   const activeTabRef = (0, import_react.useRef)(initialState.activeTab);
   activeTabRef.current = state.activeTab;
-  (0, import_react.useEffect)(() => {
+  const isActiveTabValid = (0, import_ahooks.useMemoizedFn)((items) => {
+    const current = activeTabRef.current;
+    const key = Array.isArray(current) ? current[0] : current;
+    return !!key && items.some((tab) => tab.key == key);
+  });
+  const getDefaultTab = (0, import_ahooks.useMemoizedFn)((items, tree) => {
     var _a, _b;
-    debugger;
-    if (!isTreeTab) {
-      setActiveTab(["0"]);
-      return;
+    if (!tree) return ["0"];
+    const defaultTab = [items[0].key];
+    if (((_b = (_a = items[0]) == null ? void 0 : _a.children) == null ? void 0 : _b.length) > 0) {
+      defaultTab.push("0");
     }
-    if (tabStyle === "switch" && tabItems.length > 0) {
-      const currentActive = activeTabRef.current;
-      const currentActiveKey = Array.isArray(currentActive) ? currentActive[0] : currentActive;
-      const isCurrentTabStillValid = currentActiveKey && tabItems.some((tab) => tab.key == currentActiveKey);
-      if (isCurrentTabStillValid) {
-        return;
-      }
-      const defaultTab = [tabItems[0].key];
-      if (((_b = (_a = tabItems[0]) == null ? void 0 : _a.children) == null ? void 0 : _b.length) > 0) {
-        defaultTab.push("0");
-      }
-      setActiveTab(defaultTab);
+    return defaultTab;
+  });
+  (0, import_react.useEffect)(() => {
+    if (!isTreeTab || tabStyle === "switch" && tabItems.length > 0) {
+      if (isActiveTabValid(tabItems)) return;
+      setActiveTab(getDefaultTab(tabItems, isTreeTab));
     }
   }, [tabItems, isTreeTab]);
   const actualCurrentPage = externalCurrentPage || state.currentPage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.55",
+  "version": "6.11.56",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",

package/es/components/list/List.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import './List.less';
-import { ListProps, BaseListItem } from './types';
-declare const _default: React.ForwardRefExoticComponent<ListProps<BaseListItem> & React.RefAttributes<any>>;
-export default _default;

package/es/components/ticketBooking/index.d.ts

@@ -1,23 +0,0 @@
-import React from 'react';
-import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
-import './index.less';
-export declare const ticketBookingInitialState: any;
-interface TicketBookingProps {
-    productExtensionType: string[];
-    bookingConfigParams: Record<string, any>;
-    isShowMenuBar?: boolean;
-    onPrerenderComplete?: () => void;
-    isShowTimeBar?: boolean;
-    isShowFloatButtons?: boolean;
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
-    isActive?: boolean;
-    rulesHooks?: any;
-    businessCode?: string;
-    storeRef?: React.MutableRefObject<any>;
-    /** 是否是弹窗编辑模式（由 TicketBookingDialog 传入） */
-    isEditTicketMode?: boolean;
-    /** 编辑模式下的初始 store 状态，会在 store 创建时合并进去 */
-    editModeInitialState?: Record<string, any>;
-}
-declare const _default: (props: TicketBookingProps) => React.JSX.Element;
-export default _default;

package/lib/components/list/List.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import './List.less';
-import { ListProps, BaseListItem } from './types';
-declare const _default: React.ForwardRefExoticComponent<ListProps<BaseListItem> & React.RefAttributes<any>>;
-export default _default;

package/lib/components/ticketBooking/index.d.ts

@@ -1,23 +0,0 @@
-import React from 'react';
-import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
-import './index.less';
-export declare const ticketBookingInitialState: any;
-interface TicketBookingProps {
-    productExtensionType: string[];
-    bookingConfigParams: Record<string, any>;
-    isShowMenuBar?: boolean;
-    onPrerenderComplete?: () => void;
-    isShowTimeBar?: boolean;
-    isShowFloatButtons?: boolean;
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
-    isActive?: boolean;
-    rulesHooks?: any;
-    businessCode?: string;
-    storeRef?: React.MutableRefObject<any>;
-    /** 是否是弹窗编辑模式（由 TicketBookingDialog 传入） */
-    isEditTicketMode?: boolean;
-    /** 编辑模式下的初始 store 状态，会在 store 创建时合并进去 */
-    editModeInitialState?: Record<string, any>;
-}
-declare const _default: (props: TicketBookingProps) => React.JSX.Element;
-export default _default;