@ray-js/framework 0.6.21 → 0.6.22-beta-1

package/lib/app/createApp.js

@@ -1,10 +1,21 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React from 'react';
 import ReactDOM from 'react-dom';
+import set from 'lodash.set';
+import { normalizeTabBar } from '@ray-js/framework-shared';
 import { Application } from '../components/Application';
+import { normalizeBasename } from '../utils';
 export function createApp(options) {
+  var _cfg$globalConfig;
+
+  var cfg = _objectSpread({}, options);
+
   var root = document.createElement('div');
   root.id = 'root';
-  document.body.appendChild(root); // 作为 web 构建的启动入口文件
+  document.body.appendChild(root); // 入口初始化 格式数据
+
+  set(cfg, 'globalConfig.basename', normalizeBasename((_cfg$globalConfig = cfg.globalConfig) === null || _cfg$globalConfig === void 0 ? void 0 : _cfg$globalConfig.basename));
+  set(cfg, 'tabBar', normalizeTabBar(cfg.tabBar, cfg.routes)); // 作为 web 构建的启动入口文件
 
-  ReactDOM.render( /*#__PURE__*/React.createElement(Application, options), root);
+  ReactDOM.render( /*#__PURE__*/React.createElement(Application, cfg), root);
 }

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

@@ -7,7 +7,6 @@ export declare type ApplicationProps = {
     tabBar: types.TabBar;
     pages: types.Pages;
     app: any;
-    basename?: string;
 };
 export declare class Application extends React.Component<ApplicationProps, {
     component?: types.PageComponent;

package/lib/components/Application/index.js

@@ -9,7 +9,6 @@ import React from 'react';
 import { createRouter } from '@ray-js/router';
 import { createAppInstance } from '../../app/createAppInstance';
 import { get } from '../../utils';
-import { normalizeTabBar } from '../../utils/normalizeTabBar';
 import { AppWrapper } from '../AppWrapper';
 import { PageWrapper } from '../PageWrapper';
 import { TabBar } from '../TabBar';
@@ -53,10 +52,10 @@ export var Application = /*#__PURE__*/function (_React$Component) {
       var _this$props = this.props,
           routes = _this$props.routes,
           pages = _this$props.pages,
-          tabBar = _this$props.tabBar,
-          globalConfig = _this$props.globalConfig;
-      var basename = globalConfig.basename;
-      document.body.style.backgroundColor = this.getGlobalConfig(['window', 'backgroundColor'], '#fff');
+          tabBar = _this$props.tabBar;
+      var basename = this.getGlobalConfig('basename', '/') || '/';
+      var bgColor = this.getGlobalConfig(['window', 'backgroundColor'], '#fff');
+      document.body.style.backgroundColor = bgColor;
       createRouter({
         basename: basename,
         routes: routes,
@@ -75,9 +74,8 @@ export var Application = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this$props2 = this.props,
           App = _this$props2.app,
-          tabBar = _this$props2.tabBar,
-          routes = _this$props2.routes,
-          basename = _this$props2.basename;
+          tabBar = _this$props2.tabBar;
+      var basename = this.getGlobalConfig('basename', '/') || '/';
       var _this$state = this.state,
           PageComponent = _this$state.component,
           matchedPage = _this$state.matchedPage; // 空页面暂不渲染，否则 appEvent 无法应用到页面内部
@@ -98,7 +96,7 @@ export var Application = /*#__PURE__*/function (_React$Component) {
         getGlobalConfig: this.getGlobalConfig
       }, /*#__PURE__*/React.createElement(PageComponent, null)), matchedPage.isTabBar && /*#__PURE__*/React.createElement(TabBar, {
         basename: basename,
-        config: normalizeTabBar(tabBar, routes)
+        config: tabBar
       })));
     }
   }]);

package/lib/components/PageWrapper/index.js

@@ -7,8 +7,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/es.object.keys.js";
-import React from 'react'; // import { normalizeTabBar } from '../../utils/normalizeTabBar';
-
+import React from 'react';
 import { lifecycle, PageInstance, PageInstanceContext } from '@ray-js/runtime';
 import { pageLifecycles } from '@ray-js/types';
 import { get } from '../../utils';

package/lib/components/TabBar/index.js

@@ -10,7 +10,7 @@ import clsx from 'clsx';
 import React from 'react';
 import router from '@ray-js/router';
 import { events, appStoreEmitter, renderOptions } from '../../store/appStore';
-import { withPublicPath } from '../../utils/withPublicPath';
+import { withPublicPath } from '../../utils';
 import styles from './index.module.less';
 export var TabBar = /*#__PURE__*/function (_React$Component) {
   _inherits(TabBar, _React$Component);
@@ -65,10 +65,7 @@ export var TabBar = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _clsx;
 
-      var _this$props = this.props,
-          config = _this$props.config,
-          _this$props$basename = _this$props.basename,
-          basename = _this$props$basename === void 0 ? '' : _this$props$basename;
+      var config = this.props.config;
       var _this$state = this.state,
           currentRoute = _this$state.currentRoute,
           renderOptions = _this$state.renderOptions;
@@ -77,12 +74,13 @@ export var TabBar = /*#__PURE__*/function (_React$Component) {
         className: clsx(styles.wrapper, (_clsx = {}, _defineProperty(_clsx, styles.hidden, !renderOptions.tabBarVisible && !renderOptions.tabBarAnimation), _defineProperty(_clsx, styles.showIn, renderOptions.tabBarVisible && renderOptions.tabBarAnimation), _defineProperty(_clsx, styles.hideOut, !renderOptions.tabBarVisible && renderOptions.tabBarAnimation), _clsx))
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.tabBar
-      }, config.list.map(function (item) {
-        var fullRoute = basename + item.route;
-        var isActive = currentRoute === fullRoute;
+      }, config.list.map(function (item, index) {
+        var fullRoute = item.route;
+        var isActive = currentRoute === fullRoute; // console.log('>>>>>>>> currentRoute: %s, item: %s', currentRoute, item.route)
+
         return /*#__PURE__*/React.createElement("div", {
           "data-full-route": fullRoute,
-          key: item.route || item.id,
+          key: item.pagePath + index,
           className: styles.item,
           onClick: function onClick() {
             router.push(item.route);

package/lib/utils/index.d.ts

@@ -1,2 +1,3 @@
-import get from 'lodash.get';
-export { get };
+export { default as get } from 'lodash.get';
+export { withPublicPath } from './withPublicPath';
+export { normalizeBasename } from './normalizeBasename';

package/lib/utils/index.js

@@ -1,2 +1,3 @@
-import get from 'lodash.get';
-export { get };
+export { default as get } from 'lodash.get';
+export { withPublicPath } from './withPublicPath';
+export { normalizeBasename } from './normalizeBasename';

package/lib/utils/normalizeBasename.d.ts

@@ -0,0 +1 @@
+export declare function normalizeBasename(p: string | undefined | null): string;

package/lib/utils/normalizeBasename.js

@@ -0,0 +1,14 @@
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.regexp.test.js";
+import slash from 'slash';
+export function normalizeBasename(p) {
+  var _p;
+
+  p = slash((_p = p) !== null && _p !== void 0 ? _p : '/');
+
+  if (!/^\//.test(p)) {
+    p = '/' + p;
+  }
+
+  return p;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/framework",
-  "version": "0.6.21",
+  "version": "0.6.22-beta-1",
   "description": "Ray Core",
   "keywords": [
     "ray"
@@ -20,20 +20,22 @@
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-js/framework-mp": "^0.6.21",
-    "@ray-js/framework-shared": "^0.6.21",
-    "@ray-js/library": "^0.6.21",
-    "@ray-js/location": "^0.6.21",
-    "@ray-js/router": "^0.6.21",
-    "@ray-js/runtime": "^0.6.21",
+    "@ray-js/framework-mp": "^0.6.22-beta-1",
+    "@ray-js/framework-shared": "^0.6.22-beta-1",
+    "@ray-js/library": "^0.6.22-beta-1",
+    "@ray-js/location": "^0.6.22-beta-1",
+    "@ray-js/router": "^0.6.22-beta-1",
+    "@ray-js/runtime": "^0.6.22-beta-1",
     "clsx": "^1.1.1",
     "hoist-non-react-statics": "^3.3.2",
     "lodash.get": "^4.4.2",
+    "lodash.set": "^4.3.2",
+    "slash": "^5.0.0",
     "tiny-invariant": "^1.1.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.6.21",
-    "@ray-js/types": "^0.6.21"
+    "@ray-js/cli": "^0.6.22-beta-1",
+    "@ray-js/types": "^0.6.22-beta-1"
   },
   "maintainers": [
     {
@@ -41,6 +43,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "cbb81571d068e6997e9b1fe95198c1b0275112e7",
+  "gitHead": "2e905a1820d0adfc0a6ca8cf3ecf1f3a584a0d44",
   "repository": {}
 }

package/lib/createApp.d.ts

@@ -1,2 +0,0 @@
-import { ApplicationProps } from './components/Application';
-export declare function createApp(options: ApplicationProps): void;

package/lib/createApp.js

@@ -1,10 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { Application } from './components/Application';
-export function createApp(options) {
-  var root = document.createElement('div');
-  root.id = 'root';
-  document.body.appendChild(root); // 作为 web 构建的启动入口文件
-
-  ReactDOM.render( /*#__PURE__*/React.createElement(Application, options), root);
-}

package/lib/utils/normalizeTabBar.d.ts

@@ -1,2 +0,0 @@
-import { Routes, TabBar } from '@ray-js/types';
-export declare function normalizeTabBar(tabBar: TabBar, routes: Routes): TabBar;

package/lib/utils/normalizeTabBar.js

@@ -1,18 +0,0 @@
-import "core-js/modules/es.array.map.js";
-import "core-js/modules/es.array.find.js";
-import "core-js/modules/es.object.to-string.js";
-export function normalizeTabBar(tabBar, routes) {
-  if (tabBar.list) {
-    tabBar.list = tabBar.list.map(function (item) {
-      if (item.id) {
-        item.route = routes.find(function (i) {
-          return i.id === item.id;
-        }).route;
-      }
-
-      return item;
-    });
-  }
-
-  return tabBar;
-}