@easy-editor/react-renderer 0.0.2-alpha.0 → 0.0.2-alpha.1

package/dist/index.js

@@ -357,7 +357,7 @@ const parseData = (schema, self, options = {}) => {
     return parseExpression({
       str: schema,
       self,
-      thisRequired: options.thisRequiredInJSE,
+      thisRequired: true,
       logScope: options.logScope
     });
   }
@@ -1036,7 +1036,7 @@ const leafWrapper = (Comp, {
 /**
  * execute method in schema.lifeCycles with context
  */
-function executeLifeCycleMethod(context, schema, method, args, thisRequiredInJSE) {
+function executeLifeCycleMethod(context, schema, method, args) {
   if (!context || !isSchema(schema) || !method) {
     return;
   }
@@ -1048,7 +1048,7 @@ function executeLifeCycleMethod(context, schema, method, args, thisRequiredInJSE
 
   // TODO: cache
   if (isJSExpression(fn) || isJSFunction(fn)) {
-    fn = thisRequiredInJSE ? parseThisRequiredExpression(fn, context) : parseExpression(fn, context);
+    fn = parseExpression(fn, context, true);
   }
   if (typeof fn !== 'function') {
     logger.error(`生命周期${method}类型不符`, fn);
@@ -1114,7 +1114,6 @@ function baseRendererFactory() {
         return parseExpression({
           str,
           self,
-          thisRequired: props?.thisRequiredInJSE,
           logScope: props.componentName
         });
       };
@@ -1131,7 +1130,7 @@ function baseRendererFactory() {
     }
     __afterInit(props) {}
     static getDerivedStateFromProps(props, state) {
-      const result = executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state], props.thisRequiredInJSE);
+      const result = executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state]);
       return result === undefined ? null : result;
     }
     async getSnapshotBeforeUpdate(...args) {
@@ -1187,7 +1186,7 @@ function baseRendererFactory() {
      * execute method in schema.lifeCycles
      */
     __executeLifeCycleMethod = (method, args) => {
-      executeLifeCycleMethod(this, this.props.__schema, method, args, this.props.thisRequiredInJSE);
+      executeLifeCycleMethod(this, this.props.__schema, method, args);
     };
 
     /**
@@ -1243,11 +1242,9 @@ function baseRendererFactory() {
     __parseData = (data, ctx) => {
       const {
         __ctx,
-        thisRequiredInJSE,
         componentName
       } = this.props;
       return parseData(data, ctx || __ctx || this, {
-        thisRequiredInJSE,
         logScope: componentName
       });
     };
@@ -2017,8 +2014,7 @@ function rendererFactory() {
       suspended: false,
       schema: {},
       onCompGetRef: () => {},
-      onCompGetCtx: () => {},
-      thisRequiredInJSE: true
+      onCompGetCtx: () => {}
     };
     constructor(props) {
       super(props);

package/dist/renderer-core/base.d.ts

@@ -3,7 +3,7 @@ import type { BaseRenderComponent } from './types';
 /**
  * execute method in schema.lifeCycles with context
  */
-export declare function executeLifeCycleMethod(context: any, schema: RootSchema, method: string, args: any, thisRequiredInJSE: boolean | undefined): any;
+export declare function executeLifeCycleMethod(context: any, schema: RootSchema, method: string, args: any): any;
 /**
  * get children from a node schema
  */

package/dist/renderer-core/types.d.ts

@@ -51,11 +51,6 @@ export interface RendererProps {
     faultComponent?: React.ComponentType<FaultComponentProps>;
     /** 设备信息 */
     device?: 'default' | 'pc' | 'mobile' | string;
-    /**
-     * @default true
-     * JSExpression 是否只支持使用 this 来访问上下文变量
-     */
-    thisRequiredInJSE?: boolean;
     /**
      * @default false
      * 当开启组件未找到严格模式时，渲染模块不会默认给一个容器组件
@@ -137,7 +132,6 @@ export interface BaseRendererProps {
     id?: string | number;
     getSchemaChangedSymbol?: () => boolean;
     setSchemaChangedSymbol?: (symbol: boolean) => void;
-    thisRequiredInJSE?: boolean;
     documentId?: string;
     getNode?: any;
     /**

package/dist/renderer-core/utils/common.d.ts

@@ -11,7 +11,6 @@ export declare const isSchema: (schema: any) => schema is NodeSchema;
 export declare const getValue: (obj: any, path: string, defaultValue?: {}) => any;
 export declare function transformArrayToMap(arr: any[], key: string, overwrite?: boolean): any;
 interface IParseOptions {
-    thisRequiredInJSE?: boolean;
     logScope?: string;
 }
 export declare const parseData: (schema: unknown, self: any, options?: IParseOptions) => any;

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@easy-editor/react-renderer",
-  "version": "0.0.2-alpha.0",
+  "version": "0.0.2-alpha.1",
   "description": "React Renderer package for EasyEditor.",
   "type": "module",
   "main": "dist/index.js",
   "files": [
     "dist",
     "LICENSE",
-    "CHANGELOG.md",
     "README.md"
   ],
   "publishConfig": {
@@ -45,11 +44,11 @@
     "@types/react-dom": "^18.3.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "@easy-editor/core": "0.0.3-alpha.0"
+    "mobx-react": "^9.2.0",
+    "@easy-editor/core": "0.0.3-alpha.1"
   },
   "dependencies": {
     "lodash-es": "^4.17.21",
-    "mobx-react": "^9.2.0",
     "prop-types": "^15.8.1",
     "react-is": "^18.3.1"
   },

package/CHANGELOG.md

@@ -1,17 +0,0 @@
-# @easy-editor/react-renderer
-
-## 0.0.2-alpha.0
-
-### Patch Changes
-
-- 3f130ae: test: build alpha
-- Updated dependencies [3f130ae]
-  - @easy-editor/core@0.0.3-alpha.0
-
-## 0.0.1
-
-### Patch Changes
-
-- 9a2c9ae: feat: all packages publish
-- Updated dependencies [9a2c9ae]
-  - @easy-editor/core@0.0.2