feat: update render/react for use with txiki.js

EmixamPP · Jun 14, 2024 · 42bdea3 · 42bdea3
1 parent 94385e9
commit 42bdea3
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 39 deletions.
diff --git a/src/render/react/components/Arc/comp.js b/src/render/react/components/Arc/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeArc = bridge.NativeRender.NativeComponents.Arc;
 
 const modes = {

diff --git a/src/render/react/components/Button/comp.js b/src/render/react/components/Button/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeButton = bridge.NativeRender.NativeComponents.Button;
 
 function setButtonProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Calendar/comp.js b/src/render/react/components/Calendar/comp.js
@@ -6,7 +6,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeCalendar = bridge.NativeRender.NativeComponents.Calendar;
 
 function setCalendarProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Canvas/comp.js b/src/render/react/components/Canvas/comp.js
@@ -5,7 +5,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeButton = bridge.NativeRender.NativeComponents.Button;
 
 function setCanvasProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Chart/comp.js b/src/render/react/components/Chart/comp.js
@@ -8,7 +8,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeChart = bridge.NativeRender.NativeComponents.Chart;
 
 const chartType = {
@@ -243,7 +243,8 @@ function setChartProps(comp, newProps, oldProps) {
       comp.dataset[prop.substring(5)] = newProps[prop];
     }
   });
-  comp.refresh();
+  // This gives issues: invalid call to setPointNum?
+  // comp.refresh();
 }
 
 export class ChartComp extends NativeChart {

diff --git a/src/render/react/components/Checkbox/comp.js b/src/render/react/components/Checkbox/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeView = bridge.NativeRender.NativeComponents.Checkbox;
 
 function setCheckboxProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Dropdownlist/comp.js b/src/render/react/components/Dropdownlist/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeDropdownlist = bridge.NativeRender.NativeComponents.Dropdownlist;
 
 function setListProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/GIF/comp.js b/src/render/react/components/GIF/comp.js
@@ -8,10 +8,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const fs = require("fs");
-const path = require("path");
-
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeGIF = bridge.NativeRender.NativeComponents.GIF;
 
 async function getGIFBinary(url) {

diff --git a/src/render/react/components/Image/comp.js b/src/render/react/components/Image/comp.js
@@ -8,10 +8,8 @@ import {
   styleGetterProp,
 } from "../config";
 
-const fs = require("fs");
-const path = require("path");
-
-const bridge = globalThis.SJSJSBridge;
+const path = globalThis[Symbol.for('tjs.internal.modules.path')];
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeImage = bridge.NativeRender.NativeComponents.Image;
 
 async function getImageBinary(url) {
@@ -38,9 +36,9 @@ function setImageProps(comp, newProps, oldProps) {
         }
         if (!isValidUrl(url)) {
           if (!path.isAbsolute(url)) {
-            url = path.resolve(__dirname, url);
+            url = path.resolve(url);
           }
-          fs.readFile(url, { encoding: "binary" })
+          tjs.readFile(url, { encoding: "binary" })
             .then((data) => {
               comp.setImageBinary(data.buffer);
             })

diff --git a/src/render/react/components/Input/comp.js b/src/render/react/components/Input/comp.js
@@ -6,7 +6,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeView = bridge.NativeRender.NativeComponents.Textarea;
 
 function setInputProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Keyboard/comp.js b/src/render/react/components/Keyboard/comp.js
@@ -6,7 +6,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeView = bridge.NativeRender.NativeComponents.Keyboard;
 
 const modes = {

diff --git a/src/render/react/components/Line/comp.js b/src/render/react/components/Line/comp.js
@@ -6,7 +6,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeLine = bridge.NativeRender.NativeComponents.Line;
 
 function setLineProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Mask/comp.js b/src/render/react/components/Mask/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeMask = bridge.NativeRender.NativeComponents.Mask;
 
 function setMaskProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/ProgressBar/comp.js b/src/render/react/components/ProgressBar/comp.js
@@ -1,7 +1,7 @@
 import { CommonComponentApi } from "../common/index";
 import { STYLE_TYPE, handleEvent, setStyle, styleGetterProp } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeProgressBar = bridge.NativeRender.NativeComponents.ProgressBar;
 
 function setProgressBarProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Roller/comp.js b/src/render/react/components/Roller/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeRoller = bridge.NativeRender.NativeComponents.Roller;
 
 function setRollerProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Slider/comp.js b/src/render/react/components/Slider/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeSlider = bridge.NativeRender.NativeComponents.Slider;
 
 function setSliderProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/switch/comp.js → src/render/react/components/Switch/comp.js b/src/render/react/components/switch/comp.js → src/render/react/components/Switch/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeComp = bridge.NativeRender.NativeComponents.Switch;
 
 function setSwitchProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/switch/config.js → src/render/react/components/Switch/config.js b/src/render/react/components/switch/config.js → src/render/react/components/Switch/config.js
diff --git a/src/render/react/components/Tabs/comp.js b/src/render/react/components/Tabs/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeTabs = bridge.NativeRender.NativeComponents.TabView;
 
 function setTabsProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Text/comp.js b/src/render/react/components/Text/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeText = bridge.NativeRender.NativeComponents.Text;
 
 function setTextProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Textarea/comp.js b/src/render/react/components/Textarea/comp.js
@@ -6,7 +6,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeView = bridge.NativeRender.NativeComponents.Textarea;
 
 function setTextareaProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/View/comp.js b/src/render/react/components/View/comp.js
@@ -7,7 +7,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeView = bridge.NativeRender.NativeComponents.View;
 
 function setViewProps(comp, newProps, oldProps) {

diff --git a/src/render/react/components/Window/comp.js b/src/render/react/components/Window/comp.js
@@ -6,7 +6,7 @@ import {
   styleGetterProp,
 } from "../config";
 
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeComp = bridge.NativeRender.NativeComponents.Window;
 
 function setWindowProps(comp, newProps, oldProps) {

diff --git a/src/render/react/core/animate/index.js b/src/render/react/core/animate/index.js
@@ -1,4 +1,4 @@
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const NativeAnimate = bridge.NativeRender.Animate;
 
 export const EAnimateEasingFunc = {

diff --git a/src/render/react/core/dimensions/index.js b/src/render/react/core/dimensions/index.js
@@ -1,4 +1,4 @@
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const dimensions = bridge.NativeRender.dimensions;
 
 export const Dimensions = dimensions;
diff --git a/src/render/react/core/renderer/index.js b/src/render/react/core/renderer/index.js
@@ -1,7 +1,5 @@
 import reconciler from "../reconciler";
 
-const bridge = globalThis.SJSJSBridge;
-
 const containerInfo = new Set();
 
 export class Renderer {

diff --git a/src/render/react/core/style/post.js b/src/render/react/core/style/post.js
@@ -1,9 +1,6 @@
 import { isValidUrl } from "../../utils/helpers";
 import { BUILT_IN_SYMBOL } from "../style/symbol";
 
-const path = require("path");
-const fs = require("fs");
-
 async function getImageBinary(url) {
   const resp = await fetch(url, {});
   const imageBuffer = await resp.arrayBuffer();

diff --git a/src/render/react/core/theme/index.js b/src/render/react/core/theme/index.js
@@ -1,4 +1,4 @@
-const bridge = globalThis.SJSJSBridge;
+const bridge = globalThis[Symbol.for('lvgljs')];
 const nativeTheme = bridge.NativeRender.theme;
 
 export const Theme = {