Merge pull request #170 from duenyang/feature/react

feat(react): 优化react适配逻辑
TDesignOteam · Nov 28, 2024 · aa18c2f · aa18c2f
2 parents c7fc2d9 + aa0a0ac
commit aa18c2f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/script/plugin-tdoc/md-to-wc.mjs b/script/plugin-tdoc/md-to-wc.mjs
@@ -30,11 +30,11 @@ function getGitTimestamp(file) {
   });
 }
 
-export default async function mdToReact(options) {
+export default async function mdToWebC(options) {
   const mdSegment = await customRender(options);
   const { demoDefsStr, demoCodesDefsStr, components } = options;
 
-  const reactSource = `
+  const webCSource = `
     import { h, define } from 'omi';
     import { signal, effect } from 'reactive-signal'
     import Prismjs from 'prismjs';
@@ -137,7 +137,7 @@ export default async function mdToReact(options) {
     }
   `;
 
-  const result = esbuild.transformSync(reactSource, {
+  const result = esbuild.transformSync(webCSource, {
     loader: 'tsx',
     jsxFactory: 'h',
     jsxFragment: 'h.f',

diff --git a/src/common.ts b/src/common.ts
@@ -1,4 +1,4 @@
-import { VNode, WeElement } from 'omi';
+import { Component, VNode, WeElement } from 'omi';
 
 export type TElement<T = undefined> = T extends undefined ? WeElement : (props: T) => WeElement;
 export type TNode<T = any> = VNode<T> | ((props: T) => VNode) | object | string | number | boolean | null;
@@ -119,3 +119,23 @@ export interface ScrollToElementParams {
 export interface ComponentScrollToElementParams extends ScrollToElementParams {
   key?: string | number;
 }
+
+export type ExtendedElement = (HTMLElement | SVGAElement | HTMLInputElement) & {
+  receiveProps: Function;
+  update: Function;
+  queuedUpdate: Function;
+  store?: unknown;
+  className?: string;
+  props: Record<string, unknown>;
+  splitText?: Function;
+  prevProps?: Record<string, unknown> & {
+    ref?:
+      | {
+          current?: unknown;
+        }
+      | Function;
+  };
+  attributes: NamedNodeMap;
+  _component?: Component;
+  _listeners: Record<string, Function>;
+} & Record<string, unknown>;
diff --git a/src/index.ts b/src/index.ts
@@ -42,4 +42,5 @@ export * from './tag-input';
 export * from './textarea';
 export * from './tooltip';
 export * from './upload';
+export * from './vue';
 export * from './watermark';
diff --git a/src/react.ts b/src/react.ts
@@ -2,27 +2,9 @@
  * 在React环境中使用的兼容方法
  */
 
-import { Component, render } from 'omi';
+import { render } from 'omi';
 
-export type ExtendedElement = (HTMLElement | SVGAElement | HTMLInputElement) & {
-  receiveProps: Function;
-  update: Function;
-  queuedUpdate: Function;
-  store?: unknown;
-  className?: string;
-  props: Record<string, unknown>;
-  splitText?: Function;
-  prevProps?: Record<string, unknown> & {
-    ref?:
-      | {
-          current?: unknown;
-        }
-      | Function;
-  };
-  attributes: NamedNodeMap;
-  _component?: Component;
-  _listeners: Record<string, Function>;
-} & Record<string, unknown>;
+import { ExtendedElement } from './common';
 
 const convertReactToOmi = (r: any): Omi.ComponentChild => {
   if (!r) return r;