Skip to content

Commit

Permalink
fix: Remove antd/lib import from @ant-design/web3 for better esm supp…
Browse files Browse the repository at this point in the history
…ort (#522)

* chore: release 1.4.1

* fix: Remove antt/lib import for better support esm

* chore: add changelog
  • Loading branch information
yutingzhao1991 authored Jan 22, 2024
1 parent 797ed5f commit 6f3e811
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .changeset/great-ties-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ant-design/web3': patch
---

fix: Remove antd/lib import from @ant-design/web3 for better esm support
4 changes: 2 additions & 2 deletions packages/web3/src/connect-modal/components/ModalPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { ConfigContext } from 'antd/lib/config-provider';
import { ConfigProvider } from 'antd';
import classNames from 'classnames';

import useIntl from '../../hooks/useIntl';
Expand All @@ -20,7 +20,7 @@ const ModalPanel: React.FC<ModalPanelProps> = (props) => {
const [panelRoute, setPanelRoute] = React.useState<PanelRoute>('init');
const routeStack = React.useRef<PanelRoute[]>(['init']);
const [selectedWallet, setSelectedWallet] = React.useState<Wallet>();
const { getPrefixCls } = React.useContext(ConfigContext);
const { getPrefixCls } = React.useContext(ConfigProvider.ConfigContext);
const prefixCls = getPrefixCls('web3-connect-modal');
const { wrapSSR, hashId } = useStyle(prefixCls);

Expand Down
5 changes: 2 additions & 3 deletions packages/web3/src/connect-modal/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import { Modal } from 'antd';
import { ConfigContext } from 'antd/lib/config-provider';
import { ConfigProvider, Modal } from 'antd';
import classNames from 'classnames';

import ModalPanel from './components/ModalPanel';
Expand All @@ -15,7 +14,7 @@ export const ConnectModal: React.FC<ConnectModalProps> & {
} = (props) => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
const { title, footer, open, className, mode, rootClassName, onCancel, ...restProps } = props;
const { getPrefixCls } = React.useContext(ConfigContext);
const { getPrefixCls } = React.useContext(ConfigProvider.ConfigContext);

const { isSimple } = useMode(mode);

Expand Down
6 changes: 3 additions & 3 deletions packages/web3/src/connect-modal/style/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { CSSInterpolation } from '@ant-design/cssinjs';
import { TinyColor } from '@ctrl/tinycolor';
import { mergeToken } from 'antd/lib/theme/internal';

import {
useStyle as useAntdStyle,
Expand Down Expand Up @@ -428,7 +427,8 @@ const genModalStyle: GenerateStyle<ConnectModalToken> = (token) => {
export function useStyle(prefixCls: string): UseStyleResult {
return useAntdStyle('ConnectModal', (token) => {
const isDark = isDarkTheme(token);
const connectModalToken: ConnectModalToken = mergeToken<ConnectModalToken>(token, {
const connectModalToken: ConnectModalToken = {
...token,
selectedBg: isDark ? token.colorWhite : token.colorPrimary,
selectedColor: token.colorBgContainer,
hoverBg: new TinyColor(isDark ? token.colorWhite : token.colorPrimary)
Expand All @@ -446,7 +446,7 @@ export function useStyle(prefixCls: string): UseStyleResult {
cardBg: new TinyColor(token.colorText).setAlpha(0.1).toRgbString(),
iconSize: token.sizeXL,
web3ComponentsCls: `.${prefixCls}`,
});
};
return [genModalStyle(connectModalToken)];
});
}
2 changes: 1 addition & 1 deletion packages/web3/src/theme/useStyle/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { CSSInterpolation } from '@ant-design/cssinjs';
import { useStyleRegister } from '@ant-design/cssinjs';
import { TinyColor } from '@ctrl/tinycolor';
import { ConfigProvider as AntdConfigProvider, theme as AntTheme } from 'antd';
import type { GlobalToken } from 'antd/lib/theme/interface';
import type { GlobalToken } from 'antd';

const { useToken } = AntTheme;

Expand Down

0 comments on commit 6f3e811

Please sign in to comment.