diff --git a/shesha-reactjs/src/components/buttonGroupConfigurator/buttonGroupItem.tsx b/shesha-reactjs/src/components/buttonGroupConfigurator/buttonGroupItem.tsx index b1bbbcc00c..6f0fdf40ba 100644 --- a/shesha-reactjs/src/components/buttonGroupConfigurator/buttonGroupItem.tsx +++ b/shesha-reactjs/src/components/buttonGroupConfigurator/buttonGroupItem.tsx @@ -90,7 +90,7 @@ export const ButtonGroupItem: FC = ({ item, actionConfigu className={classNames('sha-toolbar-btn sha-toolbar-btn-configurable')} size={size} block={block} - style={{ ...newStyles, ...(isGhost ? getGhostStyleOverrides() : {}) }} + style={{ ...newStyles, ...(isGhost ? getGhostStyleOverrides(buttonStyles.fontStyles) : {}) }} > {label} diff --git a/shesha-reactjs/src/components/dynamicModal/index.tsx b/shesha-reactjs/src/components/dynamicModal/index.tsx index c2bc84dd08..dee121e384 100644 --- a/shesha-reactjs/src/components/dynamicModal/index.tsx +++ b/shesha-reactjs/src/components/dynamicModal/index.tsx @@ -54,7 +54,7 @@ export const DynamicModalWithContent: FC = (props centered classNames={{ body: styles.dynamicModalBody }} mask={{ closable: false }} - closable={showCloseIcon ?? true} // Add this line - default to true for backward compatibility + closable={showCloseIcon ?? true} okButtonProps={{ disabled: isSubmitted, loading: isSubmitted }} > {renderContent(content)} diff --git a/shesha-reactjs/src/components/endpointsAutocomplete/endpointsAutocomplete.tsx b/shesha-reactjs/src/components/endpointsAutocomplete/endpointsAutocomplete.tsx index 364bd4b7ad..ff9cb6e67e 100644 --- a/shesha-reactjs/src/components/endpointsAutocomplete/endpointsAutocomplete.tsx +++ b/shesha-reactjs/src/components/endpointsAutocomplete/endpointsAutocomplete.tsx @@ -191,4 +191,4 @@ export const EndpointsAutocomplete: FC = ({ readOnl : ( <>{autocomplete} ); -}; +}; diff --git a/shesha-reactjs/src/components/formDesigner/components/styles.ts b/shesha-reactjs/src/components/formDesigner/components/styles.ts index fc26e57cf5..a5cb766038 100644 --- a/shesha-reactjs/src/components/formDesigner/components/styles.ts +++ b/shesha-reactjs/src/components/formDesigner/components/styles.ts @@ -31,6 +31,7 @@ export const useStyles = createStyles(({ css, cx, token }, { autoAlignLabel = tr .ant-form-item-control-input { width: 100% !important; + min-height: 0px !important; } .ant-form-item-control-input-content { diff --git a/shesha-reactjs/src/designer-components/button/buttonGroup/buttonGroup.tsx b/shesha-reactjs/src/designer-components/button/buttonGroup/buttonGroup.tsx index db6ca1603a..d6958c749b 100644 --- a/shesha-reactjs/src/designer-components/button/buttonGroup/buttonGroup.tsx +++ b/shesha-reactjs/src/designer-components/button/buttonGroup/buttonGroup.tsx @@ -131,7 +131,7 @@ const InlineItem: FC = (props) => { .map((childItem) => (createMenuItem({ ...childItem, buttonType: childItem.buttonType ?? 'link' }, getIsVisible, appContext, form))); // Ghost buttons: only foreground color, no background/border/shadow const isGhostType = item.buttonType === 'ghost'; - const ghostOverrides = isGhostType ? getGhostStyleOverrides() : {}; + const ghostOverrides = isGhostType ? getGhostStyleOverrides(item.font) : item.styles; return ( = (props) => { const actualButtonType = isGhostType ? 'default' : (props.buttonType as ButtonType); // Ghost buttons: only foreground color, no background/border/shadow - const ghostOverrides = isGhostType ? getGhostStyleOverrides() : {}; + const ghostOverrides = isGhostType ? getGhostStyleOverrides(props.style) : props.style; return (