From b489f0f23a5d746251c16cbe8cd13e7076f86247 Mon Sep 17 00:00:00 2001 From: anlyyao Date: Tue, 20 Aug 2024 16:41:33 +0800 Subject: [PATCH] test: update csr and ssr snap --- src/_common | 2 +- src/link/Link.tsx | 5 +- src/link/_example/index.tsx | 14 +- src/link/_example/style/index.css | 6 - src/link/index.ts | 4 +- test/snap/__snapshots__/csr.test.jsx.snap | 3991 ++++++++++----------- test/snap/__snapshots__/ssr.test.jsx.snap | 34 +- 7 files changed, 1949 insertions(+), 2107 deletions(-) delete mode 100644 src/link/_example/style/index.css diff --git a/src/_common b/src/_common index 421fe8ee..cfcad47f 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit 421fe8eefeb19792035704467e1af0840fff27cd +Subproject commit cfcad47f9c27eaf31ad50de07347f8c07685a090 diff --git a/src/link/Link.tsx b/src/link/Link.tsx index 7cf7005b..d2df9e5d 100644 --- a/src/link/Link.tsx +++ b/src/link/Link.tsx @@ -3,6 +3,7 @@ import React from 'react'; import useConfig from '../_util/useConfig'; import { TdLinkProps } from './type'; import { StyledProps } from '../common'; +import parseTNode from '../_util/parseTNode'; import useDefaultProps from '../hooks/useDefaultProps'; import { linkDefaultProps } from './defaultProps'; @@ -54,9 +55,9 @@ const Link = React.forwardRef((props, ref) => { )} onClick={handleClick} > - {prefixIcon && {prefixIcon}} + {prefixIcon && {parseTNode(prefixIcon)}} {childNode && {childNode}} - {suffixIcon && {suffixIcon}} + {suffixIcon && {parseTNode(suffixIcon)}} ); }); diff --git a/src/link/_example/index.tsx b/src/link/_example/index.tsx index edc96afc..88a10704 100644 --- a/src/link/_example/index.tsx +++ b/src/link/_example/index.tsx @@ -15,25 +15,25 @@ export default function LinkDemo() { return (
- + - + - + - + - + - + - +
diff --git a/src/link/_example/style/index.css b/src/link/_example/style/index.css deleted file mode 100644 index b119505d..00000000 --- a/src/link/_example/style/index.css +++ /dev/null @@ -1,6 +0,0 @@ -.demo-content { - height: 48px; - background-color: var(--bg-color-demo, #fff); - display: flex; - justify-content: space-around; -} diff --git a/src/link/index.ts b/src/link/index.ts index 13b270b3..982e5c1e 100644 --- a/src/link/index.ts +++ b/src/link/index.ts @@ -1,10 +1,8 @@ import _Link from './Link'; import './style/index.js'; -import { TdLinkProps } from './type'; -export type LinkProps = TdLinkProps; -export * from './type'; +export type { LinkProps } from './Link'; export const Link = _Link; export default Link; diff --git a/test/snap/__snapshots__/csr.test.jsx.snap b/test/snap/__snapshots__/csr.test.jsx.snap index ee1ab0ac..fe16d4e4 100644 --- a/test/snap/__snapshots__/csr.test.jsx.snap +++ b/test/snap/__snapshots__/csr.test.jsx.snap @@ -2394,7 +2394,6 @@ exports[`csr snapshot test > csr test src/grid/_example/badge.tsx 1`] = ` `; -<<<<<<< HEAD exports[`csr snapshot test > csr test src/icon/_example/base.tsx 1`] = `
csr test src/icon/_example/base.tsx 1`] = ` style="color: rgb(0, 82, 217);" />
-======= -exports[`csr snapshot test > csr test src/link/_example/base.tsx 1`] = ` -
-
- - - 跳转链接 - - - - - 跳转链接 - - ->>>>>>> 8e816b1 (feat(link): 更新快照)
`; -<<<<<<< HEAD exports[`csr snapshot test > csr test src/icon/_example/enhanced.tsx 1`] = `
csr test src/icon/_example/iconfont-enhanced.tsx 1` `; exports[`csr snapshot test > csr test src/icon/_example/index.tsx 1`] = ` -======= -exports[`csr snapshot test > csr test src/link/_example/index.tsx 1`] = ` ->>>>>>> 8e816b1 (feat(link): 更新快照)
csr test src/link/_example/index.tsx 1`] = `

-<<<<<<< HEAD Icon 图标 -======= - Link 链接 ->>>>>>> 8e816b1 (feat(link): 更新快照)

-<<<<<<< HEAD Icon 作为UI构成中重要的元素，一定程度上影响UI界面整体呈现出的风格。 -======= - 当功能使用图标即可表意清楚时，可使用纯图标悬浮按钮，例如：添加、发布。 ->>>>>>> 8e816b1 (feat(link): 更新快照)

csr test src/link/_example/index.tsx 1`] = `

-<<<<<<< HEAD SVG 全量引入

@@ -6516,1106 +6476,1276 @@ exports[`csr snapshot test > csr test src/input/_example/suffix.tsx 1`] = `
`; -exports[`csr snapshot test > csr test src/loading/_example/attach.tsx 1`] = ` +exports[`csr snapshot test > csr test src/link/_example/base.tsx 1`] = `
-
- Hello, I\`'m Alice. I\`'m going to be a front-end developer. -
-
- + class="t-link__content" + > + 跳转链接 + +
`; -exports[`csr snapshot test > csr test src/loading/_example/base.tsx 1`] = ` +exports[`csr snapshot test > csr test src/link/_example/index.tsx 1`] = `
- - -
- - -
-
-