@ray-js/framework 1.6.19 → 1.6.20

package/lib/components/Application/index.js

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import '../../runtime';
 import React from 'react';
 import { createRouter } from '@ray-js/router';
@@ -13,13 +12,6 @@ const isClassComponent = Component => {
 export class Application extends React.Component {
   constructor(props) {
     super(props);
-    _defineProperty(this, "getGlobalConfig", (path, defaultValue) => {
-      const {
-        globalConfig = {}
-      } = this.props;
-      const value = get(globalConfig, path, defaultValue);
-      return value;
-    });
     this.state = {};
     const title = this.getGlobalConfig(['window', 'navigationBarTitleText'], 'Ray App');
     document.title = title;
@@ -46,6 +38,13 @@ export class Application extends React.Component {
       }
     });
   }
+  getGlobalConfig = (path, defaultValue) => {
+    const {
+      globalConfig = {}
+    } = this.props;
+    const value = get(globalConfig, path, defaultValue);
+    return value;
+  };
   render() {
     const {
       app: App,

package/lib/components/PageWrapper/index.js

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import React from 'react';
@@ -7,51 +6,9 @@ import { pageLifecycles } from '@ray-js/types';
 import { get } from '../../utils';
 import './index.module.less';
 export class PageWrapper extends React.Component {
+  $reachBottomDistance = 50;
   constructor(props) {
     super(props);
-    _defineProperty(this, "$reachBottomDistance", 50);
-    _defineProperty(this, "handlePageResize", () => {
-      const windowWidth = document.documentElement.clientWidth;
-      const windowHeight = document.documentElement.clientHeight;
-      lifecycle.emit({
-        uniqueId: this.$instance.uniqueId,
-        name: pageLifecycles.onResize,
-        args: {
-          windowWidth,
-          windowHeight
-        }
-      });
-    });
-    _defineProperty(this, "handlePageScroll", () => {
-      const event = {
-        scrollTop: window.scrollY
-      };
-      lifecycle.emit({
-        uniqueId: this.$instance.uniqueId,
-        name: pageLifecycles.onPageScroll,
-        args: event
-      });
-      this.checkReachBottom();
-    });
-    _defineProperty(this, "checkReachBottom", () => {
-      const isCurrentReachBottom = document.body.scrollHeight - (window.innerHeight + window.scrollY) <= this.$reachBottomDistance;
-      if (!this.$isReachBottom && isCurrentReachBottom) {
-        this.$isReachBottom = true;
-        lifecycle.emit({
-          uniqueId: this.$instance.uniqueId,
-          name: pageLifecycles.onReachBottom
-        });
-        return;
-      }
-      this.$isReachBottom = isCurrentReachBottom;
-    });
-    _defineProperty(this, "getPageConfig", (field, defaultValue) => {
-      const {
-        page
-      } = this.props;
-      const pageConfig = page.config;
-      return get(pageConfig, field, defaultValue);
-    });
     this.$instance = new PageInstance();
     lifecycle.addInstance(this.$instance);
     this.getGlobalConfig = this.props.getGlobalConfig;
@@ -97,6 +54,48 @@ export class PageWrapper extends React.Component {
     lifecycle.removeInstance(this.$instance);
     // TODO: 实现 onPullDownRefresh 生命周期
   }
+  handlePageResize = () => {
+    const windowWidth = document.documentElement.clientWidth;
+    const windowHeight = document.documentElement.clientHeight;
+    lifecycle.emit({
+      uniqueId: this.$instance.uniqueId,
+      name: pageLifecycles.onResize,
+      args: {
+        windowWidth,
+        windowHeight
+      }
+    });
+  };
+  handlePageScroll = () => {
+    const event = {
+      scrollTop: window.scrollY
+    };
+    lifecycle.emit({
+      uniqueId: this.$instance.uniqueId,
+      name: pageLifecycles.onPageScroll,
+      args: event
+    });
+    this.checkReachBottom();
+  };
+  checkReachBottom = () => {
+    const isCurrentReachBottom = document.body.scrollHeight - (window.innerHeight + window.scrollY) <= this.$reachBottomDistance;
+    if (!this.$isReachBottom && isCurrentReachBottom) {
+      this.$isReachBottom = true;
+      lifecycle.emit({
+        uniqueId: this.$instance.uniqueId,
+        name: pageLifecycles.onReachBottom
+      });
+      return;
+    }
+    this.$isReachBottom = isCurrentReachBottom;
+  };
+  getPageConfig = (field, defaultValue) => {
+    const {
+      page
+    } = this.props;
+    const pageConfig = page.config;
+    return get(pageConfig, field, defaultValue);
+  };
   render() {
     const {
       page,

package/lib/components/TabBar/index.js

@@ -1,6 +1,4 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "core-js/modules/esnext.iterator.map.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 import clsx from 'clsx';
 import React from 'react';
 import router from '@ray-js/router';
@@ -8,13 +6,10 @@ import { events, appStoreEmitter, renderOptions } from '../../store/appStore';
 import { withPublicPath } from '../../utils';
 import styles from './index.module.less';
 export class TabBar extends React.Component {
-  constructor() {
-    super(...arguments);
-    _defineProperty(this, "state", {
-      currentRoute: router.scheduler.currentRoute,
-      renderOptions: renderOptions
-    });
-  }
+  state = (() => ({
+    currentRoute: router.scheduler.currentRoute,
+    renderOptions: renderOptions
+  }))();
   componentDidMount() {
     this.unChangeHandle = router.scheduler.on('routeChange', route => {
       this.setState({
@@ -62,7 +57,7 @@ export class TabBar extends React.Component {
         }
       }, item.icon && /*#__PURE__*/React.createElement("img", {
         className: styles.icon,
-        src: "".concat(withPublicPath(isActive ? item.activeIcon : item.icon))
+        src: `${withPublicPath(isActive ? item.activeIcon : item.icon)}`
       }), /*#__PURE__*/React.createElement("span", {
         className: styles.text,
         style: {

package/lib/runtime/responsive.js

@@ -3,13 +3,13 @@ export function responsive() {
   function setRem() {
     let clientWidth = htmlRoot.clientWidth;
     // clientWidth = Math.min(clientWidth, 640); // PC 模式下限定最大值
-    htmlRoot.style.fontSize = "".concat(clientWidth / 7.5, "px");
+    htmlRoot.style.fontSize = `${clientWidth / 7.5}px`;
     const div = document.createElement('div');
     div.style.width = '7.5rem';
     document.body.appendChild(div);
-    htmlRoot.style.fontSize = "".concat(parseFloat(htmlRoot.style.fontSize) * clientWidth / div.clientWidth, "px");
+    htmlRoot.style.fontSize = `${parseFloat(htmlRoot.style.fontSize) * clientWidth / div.clientWidth}px`;
     document.body.removeChild(div);
-    document.body.style.fontSize = "16px";
+    document.body.style.fontSize = `16px`;
   }
   let b = null;
   window.addEventListener('resize', function () {

package/lib/utils/normalizeBasename.js

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

package/lib/utils/withPublicPath.js

@@ -1,5 +1,3 @@
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.string.replace.js";
 export function withPublicPath(basePath) {
   return PUBLIC_PATH + basePath.replace(/^\//, '');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/framework",
-  "version": "1.6.19",
+  "version": "1.6.20",
   "description": "Ray Core",
   "keywords": [
     "ray"
@@ -23,12 +23,12 @@
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-js/framework-mp": "1.6.19",
-    "@ray-js/framework-shared": "1.6.19",
-    "@ray-js/library": "1.6.19",
-    "@ray-js/location": "1.6.19",
-    "@ray-js/router": "1.6.19",
-    "@ray-js/runtime": "1.6.19",
+    "@ray-js/framework-mp": "1.6.20",
+    "@ray-js/framework-shared": "1.6.20",
+    "@ray-js/library": "1.6.20",
+    "@ray-js/location": "1.6.20",
+    "@ray-js/router": "1.6.20",
+    "@ray-js/runtime": "1.6.20",
     "clsx": "^1.2.1",
     "hoist-non-react-statics": "^3.3.2",
     "lodash.get": "^4.4.2",
@@ -37,12 +37,12 @@
     "tiny-invariant": "^1.3.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.19",
-    "@ray-js/types": "1.6.19"
+    "@ray-js/cli": "1.6.20",
+    "@ray-js/types": "1.6.20"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "4ea8520f14ca36fcd9a397609c329421ce5704db"
+  "gitHead": "09a3ae02055470a3c05e953f2a4aec0d34c12952"
 }