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

Merge branch 'feature/components-typescript' of github.com:ONLYOFFICE/DocSpace-client into feature/components-typescript

Browse Source
This commit is contained in:
Alexey Safronov 2023-12-29 11:37:21 +04:00
commit 65b33f7a07
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/pages/PortalSettings/categories/developer-tools/Api/index.js
View File

@ -48,7 +48,7 @@ const Api = (props) => {
label={t("Common:LearnMore")}
primary
size="normal"
minwidth="135px"
minWidth="135px"
onClick={() => window.open(apiBasicLink, "_blank")}
scale={currentDeviceType === DeviceType.mobile}
/>

2
packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js
View File

@ -216,7 +216,7 @@ class ThirdPartyServices extends React.Component {
label={t("Submit")}
primary
size="normal"
minwidth="138px"
minWidth="138px"
onClick={submitRequest}
scale={isMobile()}
/>

2
packages/client/src/pages/PortalSettings/categories/security/sub-components/HistoryMainContent.js
View File

@ -364,7 +364,7 @@ const HistoryMainContent = (props) => {
primary
label={downloadReport}
size="normal"
minwidth="auto"
minWidth="auto"
onClick={() => getReport()}
isDisabled={isSettingNotPaid}
isLoading={isLoadingDownloadReport}

5
packages/shared/components/table/TableHeader.tsx
View File

@ -970,7 +970,7 @@ class TableHeader extends React.Component<
this.moveToLeft(widths, newWidth, colIndex - 1);
return;
}
if (columnIndex) {
if (columnIndex !== null) {
const offset = getSubstring(widths[+columnIndex]) - newWidth;
const column2Width = getSubstring(widths[colIndex]);
@ -1082,8 +1082,9 @@ class TableHeader extends React.Component<
const { containerRef, theme } = this.props;
const isRtl = theme.interfaceDirection === "rtl";
if (!columnIndex) return;
if (columnIndex === null) return;
const column = document.getElementById(`column_${columnIndex}`);
if (!column) return;
const columnSize = column.getBoundingClientRect();