feat: 支持 React 18 (兼容 React 16/17) #2373
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| npm_config_legacy_peer_deps=true | ||
| side-effects-cache=false | ||
| prefer-workspace-packages=true | ||
| auto-install-peers=false | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,8 @@ | ||
| /* eslint-disable jest/expect-expect */ | ||
| import { Text, type Group } from '@antv/g'; | ||
| import { get } from 'lodash'; | ||
| import { createPivotSheet } from 'tests/util/helpers'; | ||
| import type { RowCell } from '@/cell'; | ||
| import { | ||
| CellType, | ||
| EXTRA_COLUMN_FIELD, | ||
|
|
@@ -16,8 +11,13 @@ | |
| type S2DataConfig, | ||
| type TextAlign, | ||
| } from '@/common'; | ||
| import type { | ||
| TextBaseline, | ||
| TextTheme, | ||
| ThemeCfg, | ||
| } from '@/common/interface/theme'; | ||
| import type { Node } from '@/facet/layout/node'; | ||
| import type { PivotSheet } from '@/sheet-type'; | ||
|
|
||
| describe('SpreadSheet Theme Tests', () => { | ||
| let s2: PivotSheet; | ||
|
|
@@ -164,8 +164,8 @@ | |
| }); | ||
| await s2.render(); | ||
| const rowCell = s2.facet.rowHeader!.children[0] as RowCell; | ||
| const actionIcon = get(rowCell, 'actionIcons.[0]') as unknown as GuiIcon; | ||
| // @ts-ignore | ||
|
Check warning on line 168 in packages/s2-core/__tests__/spreadsheet/theme-spec.ts
|
||
| const cfg = actionIcon.cfg; | ||
|
|
||
| expect(actionIcon.name).toEqual(iconInfo.name); | ||
|
|
@@ -201,15 +201,15 @@ | |
|
|
||
| const rowCell = s2.facet.rowHeader!.children[0] as RowCell; | ||
|
|
||
| const rowCellWidth = rowCell.getMeta().width; | ||
| const actionIcon = rowCell.getActionIcons()[0]; | ||
| // @ts-ignore | ||
|
Check warning on line 206 in packages/s2-core/__tests__/spreadsheet/theme-spec.ts
|
||
| const actionIconCfg = actionIcon.cfg; | ||
|
|
||
| expect(actionIconCfg.x).toBeGreaterThanOrEqual(0); | ||
| expect( | ||
| (actionIconCfg.x as number) + (actionIconCfg.width as number), | ||
| ).toBeLessThanOrEqual(rowCellWidth); | ||
| }, | ||
| ); | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pnpm/pnpm#6649 (comment)
CI 升级到 pnpm 8 后安装依赖报错的解决方案