@rsmax/web 1.3.11 → 1.3.13

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.13](https://github.com/remaxjs/remax/compare/v1.3.12...v1.3.13) (2025-06-16)
+
+**Note:** Version bump only for package @rsmax/web
+
+## [1.3.12](https://github.com/remaxjs/remax/compare/v1.3.11...v1.3.12) (2025-06-08)
+
+**Note:** Version bump only for package @rsmax/web
+
 ## [1.3.11](https://github.com/remaxjs/remax/compare/v1.3.8...v1.3.11) (2025-06-04)
 
 **Note:** Version bump only for package @rsmax/web

package/assets/normalize.css

@@ -1,17 +1,15 @@
-/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
    ========================================================================== */
 
 /**
  * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in
- *    IE on Windows Phone and in iOS.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
 html {
   line-height: 1.15; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
   -webkit-text-size-adjust: 100%; /* 2 */
 }
 
@@ -19,7 +17,7 @@ html {
    ========================================================================== */
 
 /**
- * Remove the margin in all browsers (opinionated).
+ * Remove the margin in all browsers.
  */
 
 body {
@@ -27,15 +25,10 @@ body {
 }
 
 /**
- * Add the correct display in IE 9-.
+ * Render the `main` element consistently in IE.
  */
 
-article,
-aside,
-footer,
-header,
-nav,
-section {
+main {
   display: block;
 }
 
@@ -52,26 +45,6 @@ h1 {
 /* Grouping content
    ========================================================================== */
 
-/**
- * Add the correct display in IE 9-.
- * 1. Add the correct display in IE.
- */
-
-figcaption,
-figure,
-main {
-  /* 1 */
-  display: block;
-}
-
-/**
- * Add the correct margin in IE 8.
- */
-
-figure {
-  margin: 1em 40px;
-}
-
 /**
  * 1. Add the correct box sizing in Firefox.
  * 2. Show the overflow in Edge and IE.
@@ -97,17 +70,15 @@ pre {
    ========================================================================== */
 
 /**
- * 1. Remove the gray background on active links in IE 10.
- * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ * Remove the gray background on active links in IE 10.
  */
 
 a {
-  background-color: transparent; /* 1 */
-  -webkit-text-decoration-skip: objects; /* 2 */
+  background-color: transparent;
 }
 
 /**
- * 1. Remove the bottom border in Chrome 57- and Firefox 39-.
+ * 1. Remove the bottom border in Chrome 57-
  * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
  */
 
@@ -117,15 +88,6 @@ abbr[title] {
   text-decoration: underline dotted; /* 2 */
 }
 
-/**
- * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
- */
-
-b,
-strong {
-  font-weight: inherit;
-}
-
 /**
  * Add the correct font weight in Chrome, Edge, and Safari.
  */
@@ -147,23 +109,6 @@ samp {
   font-size: 1em; /* 2 */
 }
 
-/**
- * Add the correct font style in Android 4.3-.
- */
-
-dfn {
-  font-style: italic;
-}
-
-/**
- * Add the correct background and color in IE 9-.
- */
-
-mark {
-  background-color: #ff0;
-  color: #000;
-}
-
 /**
  * Add the correct font size in all browsers.
  */
@@ -197,44 +142,18 @@ sup {
    ========================================================================== */
 
 /**
- * Add the correct display in IE 9-.
- */
-
-audio,
-video {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in iOS 4-7.
- */
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-/**
- * Remove the border on images inside links in IE 10-.
+ * Remove the border on images inside links in IE 10.
  */
 
 img {
   border-style: none;
 }
 
-/**
- * Hide the overflow in IE.
- */
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
 /* Forms
    ========================================================================== */
 
 /**
- * 1. Change the font styles in all browsers (opinionated).
+ * 1. Change the font styles in all browsers.
  * 2. Remove the margin in Firefox and Safari.
  */
 
@@ -243,7 +162,7 @@ input,
 optgroup,
 select,
 textarea {
-  font-family: sans-serif; /* 1 */
+  font-family: inherit; /* 1 */
   font-size: 100%; /* 1 */
   line-height: 1.15; /* 1 */
   margin: 0; /* 2 */
@@ -255,8 +174,7 @@ textarea {
  */
 
 button,
-input {
-  /* 1 */
+input { /* 1 */
   overflow: visible;
 }
 
@@ -266,22 +184,19 @@ input {
  */
 
 button,
-select {
-  /* 1 */
+select { /* 1 */
   text-transform: none;
 }
 
 /**
- * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
- *    controls in Android 4.
- * 2. Correct the inability to style clickable types in iOS and Safari.
+ * Correct the inability to style clickable types in iOS and Safari.
  */
 
 button,
-html [type="button"], /* 1 */
+[type="button"],
 [type="reset"],
 [type="submit"] {
-  -webkit-appearance: button; /* 2 */
+  -webkit-appearance: button;
 }
 
 /**
@@ -289,9 +204,9 @@ html [type="button"], /* 1 */
  */
 
 button::-moz-focus-inner,
-[type='button']::-moz-focus-inner,
-[type='reset']::-moz-focus-inner,
-[type='submit']::-moz-focus-inner {
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
   border-style: none;
   padding: 0;
 }
@@ -301,9 +216,9 @@ button::-moz-focus-inner,
  */
 
 button:-moz-focusring,
-[type='button']:-moz-focusring,
-[type='reset']:-moz-focusring,
-[type='submit']:-moz-focusring {
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
   outline: 1px dotted ButtonText;
 }
 
@@ -332,17 +247,15 @@ legend {
 }
 
 /**
- * 1. Add the correct display in IE 9-.
- * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
  */
 
 progress {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
+  vertical-align: baseline;
 }
 
 /**
- * Remove the default vertical scrollbar in IE.
+ * Remove the default vertical scrollbar in IE 10+.
  */
 
 textarea {
@@ -350,12 +263,12 @@ textarea {
 }
 
 /**
- * 1. Add the correct box sizing in IE 10-.
- * 2. Remove the padding in IE 10-.
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
  */
 
-[type='checkbox'],
-[type='radio'] {
+[type="checkbox"],
+[type="radio"] {
   box-sizing: border-box; /* 1 */
   padding: 0; /* 2 */
 }
@@ -364,8 +277,8 @@ textarea {
  * Correct the cursor style of increment and decrement buttons in Chrome.
  */
 
-[type='number']::-webkit-inner-spin-button,
-[type='number']::-webkit-outer-spin-button {
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
   height: auto;
 }
 
@@ -374,17 +287,16 @@ textarea {
  * 2. Correct the outline style in Safari.
  */
 
-[type='search'] {
+[type="search"] {
   -webkit-appearance: textfield; /* 1 */
   outline-offset: -2px; /* 2 */
 }
 
 /**
- * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ * Remove the inner padding in Chrome and Safari on macOS.
  */
 
-[type='search']::-webkit-search-cancel-button,
-[type='search']::-webkit-search-decoration {
+[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
@@ -402,12 +314,10 @@ textarea {
    ========================================================================== */
 
 /*
- * Add the correct display in IE 9-.
- * 1. Add the correct display in Edge, IE, and Firefox.
+ * Add the correct display in Edge, IE 10+, and Firefox.
  */
 
-details, /* 1 */
-menu {
+details {
   display: block;
 }
 
@@ -419,30 +329,19 @@ summary {
   display: list-item;
 }
 
-/* Scripting
+/* Misc
    ========================================================================== */
 
 /**
- * Add the correct display in IE 9-.
- */
-
-canvas {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in IE.
+ * Add the correct display in IE 10+.
  */
 
 template {
   display: none;
 }
 
-/* Hidden
-   ========================================================================== */
-
 /**
- * Add the correct display in IE 10-.
+ * Add the correct display in IE 10.
  */
 
 [hidden] {

package/cjs/KeepAlive.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+export declare const KeepAliveProvider: React.FC<{
+    children: React.ReactNode;
+}>;
+interface KeepAliveProps {
+    cacheKey: string;
+    children: React.ReactNode;
+}
+export declare const KeepAlive: React.FC<KeepAliveProps>;
+export {};

package/cjs/KeepAlive.js

@@ -0,0 +1,96 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeepAlive = exports.KeepAliveProvider = void 0;
+const react_1 = __importStar(require("react"));
+const react_router_dom_1 = require("react-router-dom");
+const KeepAliveContext = (0, react_1.createContext)(null);
+const KeepAliveProvider = ({ children }) => {
+    const [cache, setCache] = (0, react_1.useState)(new Map());
+    return (react_1.default.createElement(KeepAliveContext.Provider, { value: { cache, setCache } },
+        children,
+        Array.from(cache.entries()).map(([key, item]) => (react_1.default.createElement("div", { key: key, style: {
+                display: item.status === 'active' ? 'block' : 'none',
+                height: '100%',
+                width: '100%',
+            } }, item.component)))));
+};
+exports.KeepAliveProvider = KeepAliveProvider;
+const KeepAlive = ({ cacheKey, children }) => {
+    const context = (0, react_1.useContext)(KeepAliveContext);
+    const location = (0, react_router_dom_1.useLocation)();
+    const componentRef = (0, react_1.useRef)(children);
+    if (!context) {
+        throw new Error('KeepAlive must be used within KeepAliveProvider');
+    }
+    const { cache, setCache } = context;
+    react_1.default.useEffect(() => {
+        // 更新组件引用
+        componentRef.current = children;
+        setCache(prev => {
+            const next = new Map(prev);
+            if (next.has(cacheKey)) {
+                next.set(cacheKey, Object.assign(Object.assign({}, next.get(cacheKey)), { component: children }));
+            }
+            return next;
+        });
+    }, [children]);
+    react_1.default.useEffect(() => {
+        // 初始化缓存
+        if (!cache.has(cacheKey)) {
+            setCache(prev => {
+                const next = new Map(prev);
+                next.set(cacheKey, {
+                    component: componentRef.current,
+                    status: 'active',
+                });
+                return next;
+            });
+        }
+        // 更新状态
+        setCache(prev => {
+            const next = new Map(prev);
+            prev.forEach((value, key) => {
+                next.set(key, Object.assign(Object.assign({}, value), { status: key === cacheKey ? 'active' : 'inactive' }));
+            });
+            return next;
+        });
+        // 清理函数
+        return () => {
+            // 这里我们不会在路由变化时删除缓存
+            // 只是将状态设置为 inactive
+            setCache(prev => {
+                const next = new Map(prev);
+                if (next.has(cacheKey)) {
+                    next.set(cacheKey, Object.assign(Object.assign({}, next.get(cacheKey)), { status: 'inactive' }));
+                }
+                return next;
+            });
+        };
+    }, [cacheKey, location.pathname]);
+    // 不直接渲染children，因为所有缓存的组件都在Provider中渲染
+    return null;
+};
+exports.KeepAlive = KeepAlive;

package/cjs/PullToRefresh.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const RemaxPullToRefresh: React.FC<any>;
-export default RemaxPullToRefresh;
+declare const RsmaxPullToRefresh: React.FC<any>;
+export default RsmaxPullToRefresh;

package/cjs/PullToRefresh.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const rmc_pull_to_refresh_1 = __importDefault(require("rmc-pull-to-refresh"));
 const LoadingIcon_1 = __importDefault(require("./LoadingIcon"));
-const RemaxPullToRefresh = props => {
+const RsmaxPullToRefresh = props => {
     return (react_1.default.createElement(rmc_pull_to_refresh_1.default, Object.assign({}, props, { getScrollContainer: () => {
             document.body;
         }, indicator: {
@@ -16,4 +16,4 @@ const RemaxPullToRefresh = props => {
             finish: react_1.default.createElement(LoadingIcon_1.default, null),
         } })));
 };
-exports.default = RemaxPullToRefresh;
+exports.default = RsmaxPullToRefresh;

package/cjs/TabBar.d.ts

@@ -1,7 +1,5 @@
 import React from 'react';
-import { History } from 'history';
-import { TabBarConfig } from './types';
-export declare function TabBar({ config, history }: {
+import type { TabBarConfig } from './types';
+export declare function TabBar({ config }: {
     config: TabBarConfig;
-    history: History;
 }): React.JSX.Element;

package/cjs/TabBar.js

@@ -6,18 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TabBar = void 0;
 const react_1 = __importDefault(require("react"));
 const react_router_dom_1 = require("react-router-dom");
-function TabBar({ config, history }) {
+function TabBar({ config }) {
     var _a;
-    const [currentPath, setCurrentPath] = react_1.default.useState(history.location.pathname);
-    react_1.default.useEffect(() => {
-        setCurrentPath(history.location.pathname);
-        return history.listen(() => {
-            setCurrentPath(history.location.pathname);
-        });
-    }, []);
+    const location = (0, react_router_dom_1.useLocation)();
+    const currentPath = location.pathname;
+    react_1.default.useEffect(() => { }, [currentPath]);
     const isActive = (url) => {
         if (!url.startsWith('/')) {
-            url = '/' + url;
+            url = `/${url}`;
         }
         return currentPath === url;
     };
@@ -29,9 +25,9 @@ function TabBarItem({ config, isActive, item }) {
     const icon = isActive ? item.activeImage || item.image : item.image;
     const textColor = (_a = config.textColor) !== null && _a !== void 0 ? _a : '#333';
     const selectedColor = (_b = config.selectedColor) !== null && _b !== void 0 ? _b : '#108ee9';
-    return (react_1.default.createElement(react_router_dom_1.Link, { to: `/${item.url}`, className: "rsmax-tab-item" },
-        react_1.default.createElement("div", { className: "rsmax-tab-item-image", style: { backgroundImage: `url(${icon})` } }),
-        react_1.default.createElement("div", { className: "rsmax-tab-item-title", style: {
+    return (react_1.default.createElement(react_router_dom_1.Link, { to: item.url.startsWith('/') ? item.url : `/${item.url}`, className: 'rsmax-tab-item' },
+        react_1.default.createElement("div", { className: 'rsmax-tab-item-image', style: { backgroundImage: `url(${icon})` } }),
+        react_1.default.createElement("div", { className: 'rsmax-tab-item-title', style: {
                 color: isActive ? selectedColor : textColor,
             } }, item.title)));
 }

package/cjs/api.js

@@ -3,20 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.switchTab = exports.reLaunch = exports.redirectTo = exports.navigateBack = exports.navigateTo = void 0;
 const framework_shared_1 = require("@rsmax/framework-shared");
 function navigateTo(params) {
-    const history = framework_shared_1.RuntimeOptions.get('history');
-    history.push(params.url);
+    const navigate = framework_shared_1.RuntimeOptions.get('navigate');
+    navigate(params.url, {
+        replace: true,
+    });
     return Promise.resolve();
 }
 exports.navigateTo = navigateTo;
 function navigateBack(params) {
-    const history = framework_shared_1.RuntimeOptions.get('history');
-    history.go(-((params === null || params === void 0 ? void 0 : params.delta) || 1));
+    const navigate = framework_shared_1.RuntimeOptions.get('navigate');
+    navigate(-((params === null || params === void 0 ? void 0 : params.delta) || 1));
     return Promise.resolve();
 }
 exports.navigateBack = navigateBack;
 function redirectTo(params) {
-    const history = framework_shared_1.RuntimeOptions.get('history');
-    history.replace(params.url);
+    const navigate = framework_shared_1.RuntimeOptions.get('navigate');
+    navigate(params.url, {
+        replace: true,
+    });
     return Promise.resolve();
 }
 exports.redirectTo = redirectTo;
@@ -25,6 +29,6 @@ function reLaunch(params) {
 }
 exports.reLaunch = reLaunch;
 function switchTab(params) {
-    navigateTo(params);
+    navigateTo(params).then();
 }
 exports.switchTab = switchTab;

package/cjs/bootstrap.d.ts

@@ -1,2 +1,2 @@
-import { BootstrapOptions } from './types';
+import type { BootstrapOptions } from './types';
 export default function bootstrap(options: BootstrapOptions): void;

package/cjs/bootstrap.js

@@ -5,18 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_1 = require("react-dom/client");
 const umi_hd_1 = __importDefault(require("umi-hd"));
-const history_1 = require("history");
-const framework_shared_1 = require("@rsmax/framework-shared");
 const createApp_1 = __importDefault(require("./createApp"));
 function bootstrap(options) {
     (0, umi_hd_1.default)();
-    const { appConfig } = options;
-    const history = !appConfig.router || appConfig.router.type !== 'browser' ? (0, history_1.createHashHistory)() : (0, history_1.createBrowserHistory)();
-    framework_shared_1.RuntimeOptions.apply({ history, mpa: false });
     const container = document.getElementById('rsmax-app');
     if (!container)
         throw new Error('Failed to find the root element');
     const root = (0, client_1.createRoot)(container);
-    root.render((0, createApp_1.default)(options, history));
+    root.render((0, createApp_1.default)(options));
 }
 exports.default = bootstrap;

package/cjs/bootstrapMpa.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const framework_shared_1 = require("@rsmax/framework-shared");
 const react_1 = __importDefault(require("react"));
 const client_1 = require("react-dom/client");
 const umi_hd_1 = __importDefault(require("umi-hd"));
 const createAppConfig_1 = __importDefault(require("./createAppConfig"));
-const framework_shared_1 = require("@rsmax/framework-shared");
 const createPageConfig_1 = __importDefault(require("./createPageConfig"));
 const noop = () => {
     // ignore
@@ -46,11 +46,11 @@ function bootstrap(options) {
             if (url.startsWith('/'))
                 publicPath = location.pathname.replace(`/${page.route}.html`, '');
             const arr = url.split('?');
-            arr[0] = arr[0] + '.html';
+            arr[0] = `${arr[0]}.html`;
             return publicPath + arr.join('?');
         },
     };
-    framework_shared_1.RuntimeOptions.apply({ pluginDriver, history, mpa: true });
+    framework_shared_1.RuntimeOptions.apply({ pluginDriver, mpa: true });
     const App = createApp(options);
     const container = document.getElementById('rsmax-app');
     if (!container)

package/cjs/createApp.d.ts

@@ -1,4 +1,3 @@
 import React from 'react';
-import { History } from 'history';
-import { BootstrapOptions } from './types';
-export default function createApp(options: BootstrapOptions, history: History): React.JSX.Element;
+import type { BootstrapOptions } from './types';
+export default function createApp(options: BootstrapOptions): React.JSX.Element;