IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #129 from ONLYOFFICE/bugfix/plugins-double-separator

Browse Source 
Client:Plugins: fix plugin double separator
This commit is contained in:
Alexey Safronov 2023-12-14 16:34:52 +04:00 committed by GitHub
commit e16609200b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/client/src/components/dialogs/SettingsPluginDialog/index.js
View File

@ -87,7 +87,12 @@ const SettingsPluginDialog = ({
setSaveButtonProps={setSaveButtonProps} setSaveButtonProps={setSaveButtonProps}
setModalRequestRunning={setModalRequestRunning} setModalRequestRunning={setModalRequestRunning}
/> />
<Info t={t} plugin={plugin} withDelete={withDelete} /> <Info
t={t}
plugin={plugin}
withDelete={withDelete}
withSeparator={!!customSettingsProps?.children}
/>
{withDelete && ( {withDelete && (
<Button <Button
label={t("DeletePlugin")} label={t("DeletePlugin")}

4
packages/client/src/components/dialogs/SettingsPluginDialog/sub-components/Info.js
View File

@ -45,7 +45,7 @@ const StyledInfo = styled.div`
gap: 8px 24px; gap: 8px 24px;
`; `;
const Info = ({ t, plugin, withDelete }) => { const Info = ({ t, plugin, withDelete, withSeparator }) => {
const locale = getCookie(LANGUAGE) || "en"; const locale = getCookie(LANGUAGE) || "en";
const uploadDate = plugin.createOn && getCorrectDate(locale, plugin.createOn); const uploadDate = plugin.createOn && getCorrectDate(locale, plugin.createOn);
@ -56,7 +56,7 @@ const Info = ({ t, plugin, withDelete }) => {
return ( return (
<StyledContainer withDelete={withDelete}> <StyledContainer withDelete={withDelete}>
<StyledSeparator /> {withSeparator && <StyledSeparator />}
<Text fontSize={"14px"} fontWeight={600} lineHeight={"16px"} noSelect> <Text fontSize={"14px"} fontWeight={600} lineHeight={"16px"} noSelect>
{t("Metadata")} {t("Metadata")}
</Text> </Text>