Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: useModal missing prefix #25967

Merged
merged 2 commits into from Aug 3, 2020
Merged

fix: useModal missing prefix #25967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d570ab
fix: useModal hooks missing style
zombieJ Aug 3, 2020
d82c898
add test case
zombieJ Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/config-provider/context.tsx
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ export interface ConfigConsumerProps {
getTargetContainer?: () => HTMLElement;
getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;
rootPrefixCls?: string;
getPrefixCls: (suffixCls: string, customizePrefixCls?: string) => string;
getPrefixCls: (suffixCls?: string, customizePrefixCls?: string) => string;
renderEmpty: RenderEmptyHandler;
csp?: CSPConfig;
autoInsertSpaceInButton?: boolean;
Expand All @@ -32,7 +32,7 @@ export interface ConfigConsumerProps {

export const ConfigContext = React.createContext<ConfigConsumerProps>({
// We provide a default function for Context without provider
getPrefixCls: (suffixCls: string, customizePrefixCls?: string) => {
getPrefixCls: (suffixCls?: string, customizePrefixCls?: string) => {
if (customizePrefixCls) return customizePrefixCls;

return suffixCls ? `ant-${suffixCls}` : 'ant';
Expand Down
2 changes: 2 additions & 0 deletions components/modal/__tests__/hook.test.js
View file
Open in desktop
Expand Up @@ -35,6 +35,8 @@ describe('Modal.hook', () => {
wrapper.find('button').simulate('click');

expect(wrapper.find('.test-hook').text()).toEqual('bamboo');
expect(wrapper.find('.ant-btn').length).toBeTruthy();
expect(wrapper.find('.ant-modal-body').length).toBeTruthy();

// Update instance
instance.update({
Expand Down
7 changes: 6 additions & 1 deletion components/modal/useModal/HookModal.tsx
View file
Open in desktop
Expand Up @@ -27,7 +27,10 @@ const HookModal: React.ForwardRefRenderFunction<HookModalRef, HookModalProps> =
) => {
const [visible, setVisible] = React.useState(true);
const [innerConfig, setInnerConfig] = React.useState(config);
const { direction } = React.useContext(ConfigContext);
const { direction, getPrefixCls } = React.useContext(ConfigContext);

const prefixCls = getPrefixCls('modal');
const rootPrefixCls = getPrefixCls();

function close() {
setVisible(false);
Expand All @@ -47,6 +50,8 @@ const HookModal: React.ForwardRefRenderFunction<HookModalRef, HookModalProps> =
<LocaleReceiver componentName="Modal" defaultLocale={defaultLocale.Modal}>
{(modalLocale: ModalLocale) => (
<ConfirmDialog
prefixCls={prefixCls}
rootPrefixCls={rootPrefixCls}
{...innerConfig}
close={close}
visible={visible}
Expand Down