refactor: _typeMark -> typeMark

alibaba-fusion · Oct 11, 2022 · 778d80e · 778d80e
1 parent 1aeaac4
commit 778d80e
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 18 deletions.
diff --git a/src/block.tsx b/src/block.tsx
@@ -126,6 +126,6 @@ RefBlock.defaultProps = {
   mode: 'surface',
   noPadding: false,
 };
-RefBlock._typeMark = 'Block';
+RefBlock.typeMark = 'Block';
 
 export default RefBlock;
diff --git a/src/cell.tsx b/src/cell.tsx
@@ -74,6 +74,6 @@ RefCell.defaultProps = {
   block: false,
   direction: 'ver',
 };
-RefCell._typeMark = 'Cell';
+RefCell.typeMark = 'Cell';
 
 export default RefCell;
diff --git a/src/col.tsx b/src/col.tsx
@@ -81,6 +81,6 @@ const Col: ForwardRefRenderFunction<HTMLDivElement, ColProps> = (props, ref) =>
 const RefCol: ICol = forwardRef(Col);
 
 RefCol.displayName = 'Col';
-RefCol._typeMark = 'Col';
+RefCol.typeMark = 'Col';
 
 export default RefCol;
diff --git a/src/grid.tsx b/src/grid.tsx
@@ -91,7 +91,7 @@ const Grid: ForwardRefRenderFunction<HTMLDivElement, GridProps> = (props, ref) =
 const RefGrid: IGrid = forwardRef(Grid);
 
 RefGrid.displayName = 'Grid';
-RefGrid._typeMark = 'Grid';
+RefGrid.typeMark = 'Grid';
 RefGrid.defaultProps = {
   rows: 1,
   cols: 1,

diff --git a/src/p.tsx b/src/p.tsx
@@ -34,7 +34,7 @@ const getChildren = (children: any, type: ParagraphProps['type'] = 'body2') => {
           </Text>,
         );
         // @ts-ignore
-      } else if (child.type._typeMark === 'Text' && !child.props.type) {
+      } else if (child.type.typeMark === 'Text' && !child.props.type) {
         return cloneElement(child, {
           type,
         });
@@ -101,7 +101,7 @@ const P: ForwardRefRenderFunction<HTMLParagraphElement, ParagraphProps> = (props
 const RefParagraph: IParagraph = forwardRef(P);
 
 RefParagraph.displayName = 'P';
-RefParagraph._typeMark = 'P';
+RefParagraph.typeMark = 'P';
 
 RefParagraph.defaultProps = {
   spacing: 'medium',

diff --git a/src/page/aside.tsx b/src/page/aside.tsx
@@ -63,6 +63,6 @@ PageAside.defaultProps = {
   width: 200,
   mode: 'transparent',
 };
-PageAside._typeMark = 'Aside';
+PageAside.typeMark = 'Aside';
 
 export default PageAside;
diff --git a/src/page/content.tsx b/src/page/content.tsx
@@ -49,7 +49,7 @@ const PageContent: ForwardRefRenderFunction<any, PageContentProps> = (
 
     if (isValidElement(child)) {
       // @ts-ignore
-      tm = child?.type?._typeMark;
+      tm = child?.type?.typeMark;
 
       if (tm === 'Nav') {
         navNode = child;
@@ -125,6 +125,6 @@ const PageContent: ForwardRefRenderFunction<any, PageContentProps> = (
 const RefPageContent: IPageContent = forwardRef(PageContent);
 
 RefPageContent.displayName = 'PageContent';
-RefPageContent._typeMark = 'Content';
+RefPageContent.typeMark = 'Content';
 
 export default RefPageContent;
diff --git a/src/page/index.tsx b/src/page/index.tsx
@@ -172,7 +172,7 @@ const Page: ForwardRefRenderFunction<any, PageProps> = (props, ref) => {
   const tmp = Children.map(children, (child) => {
     if (isValidElement(child)) {
       // @ts-ignore
-      const tm = child?.type?._typeMark;
+      const tm = child?.type?.typeMark;
 
       if (tm) {
         if (tm === 'Header') {

diff --git a/src/page/nav.tsx b/src/page/nav.tsx
@@ -59,6 +59,6 @@ PageNav.defaultProps = {
   width: 200,
   mode: 'transparent',
 };
-PageNav._typeMark = 'Nav';
+PageNav.typeMark = 'Nav';
 
 export default PageNav;
diff --git a/src/page/page-footer.tsx b/src/page/page-footer.tsx
@@ -45,6 +45,6 @@ PageFooter.defaultProps = {
   fullWidth: false,
   mode: 'surface',
 };
-PageFooter._typeMark = 'Footer';
+PageFooter.typeMark = 'Footer';
 
 export default PageFooter;
diff --git a/src/page/page-header.tsx b/src/page/page-header.tsx
@@ -47,6 +47,6 @@ PageHeader.defaultProps = {
   mode: 'surface',
 };
 
-PageHeader._typeMark = 'Header';
+PageHeader.typeMark = 'Header';
 
 export default PageHeader;
diff --git a/src/row.tsx b/src/row.tsx
@@ -84,6 +84,6 @@ const Row: ForwardRefRenderFunction<HTMLDivElement, RowProps> = (props, ref) =>
 const RefRow: IRow = forwardRef(Row);
 
 RefRow.displayName = 'Row';
-RefRow._typeMark = 'Row';
+RefRow.typeMark = 'Row';
 
 export default RefRow;
diff --git a/src/section.tsx b/src/section.tsx
@@ -50,7 +50,7 @@ function wrapBlock(children: ReactNode, maxNumberOfColumns: number) {
   const validChildList = Children.toArray(children).filter((child) => !isNil(child));
 
   validChildList.forEach((child: any, index) => {
-    if (child?.type === Block || child?.type?._typeMark === 'Block') {
+    if (child?.type === Block || child?.type?.typeMark === 'Block') {
       if (tmp.length > 0) {
         ret.push(
           <Block key={`cs-${index}`} span={maxNumberOfColumns}>
@@ -243,6 +243,6 @@ const Section: ForwardRefRenderFunction<HTMLDivElement, SectionProps> = (props,
 
 const RefSection: ISection = forwardRef(Section);
 RefSection.displayName = 'Section';
-RefSection._typeMark = 'Section';
+RefSection.typeMark = 'Section';
 
 export default RefSection;
diff --git a/src/text.tsx b/src/text.tsx
@@ -95,7 +95,7 @@ const Text: ITextComponent = (props) => {
 };
 
 Text.displayName = 'Text';
-Text._typeMark = 'Text';
+Text.typeMark = 'Text';
 Text.defaultProps = {
   align: 'left',
   type: 'body2',

diff --git a/src/types.ts b/src/types.ts
@@ -20,7 +20,7 @@ export interface BaseBgMode {
 }
 
 export interface TypeMark {
-  _typeMark?: string;
+  typeMark?: string;
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ export interface BaseBgMode { @@
     }
     export interface TypeMark {
-      _typeMark?: string;
+      typeMark?: string;
     }
     /**
@@ Expand Down @@