diff --git a/packages/client/src/components/FilesSelector/FilesSelector.types.ts b/packages/client/src/components/FilesSelector/FilesSelector.types.ts
index ffb6752146..62d246bf57 100644
--- a/packages/client/src/components/FilesSelector/FilesSelector.types.ts
+++ b/packages/client/src/components/FilesSelector/FilesSelector.types.ts
@@ -29,12 +29,15 @@ import {
TFilesSettings,
TFolder,
} from "@docspace/shared/api/files/types";
-import { TBreadCrumb } from "@docspace/shared/components/selector/Selector.types";
+import {
+ TBreadCrumb,
+ TSelectorHeader,
+} from "@docspace/shared/components/selector/Selector.types";
import { DeviceType } from "@docspace/shared/enums";
import { TTheme } from "@docspace/shared/themes";
import SocketIOHelper from "@docspace/shared/utils/socket";
-export type FilesSelectorProps = {
+export type FilesSelectorProps = TSelectorHeader & {
isPanelVisible: boolean;
// withoutImmediatelyClose: boolean;
isThirdParty: boolean;
diff --git a/packages/client/src/components/FilesSelector/index.tsx b/packages/client/src/components/FilesSelector/index.tsx
index 1e95e8ab26..a8d133eb90 100644
--- a/packages/client/src/components/FilesSelector/index.tsx
+++ b/packages/client/src/components/FilesSelector/index.tsx
@@ -140,6 +140,7 @@ const FilesSelectorWrapper = ({
openRoot,
filesSettings,
+ headerProps,
}: FilesSelectorProps) => {
const { t }: { t: TTranslation } = useTranslation([
"Files",
@@ -392,6 +393,7 @@ const FilesSelectorWrapper = ({
getFilesArchiveError={getFilesArchiveError}
withCreate={(isMove || isCopy || isRestore || isRestoreAll) ?? false}
filesSettings={filesSettings}
+ headerProps={headerProps}
/>
);
};
diff --git a/packages/client/src/pages/Sdk/index.js b/packages/client/src/pages/Sdk/index.js
index 87c3128c14..8d5fe08d7f 100644
--- a/packages/client/src/pages/Sdk/index.js
+++ b/packages/client/src/pages/Sdk/index.js
@@ -262,7 +262,10 @@ const Sdk = ({
: {};
const headerProps = frameConfig?.showSelectorHeader
- ? { withHeader: true, headerProps: { headerLabel: "" } }
+ ? {
+ withHeader: true,
+ headerProps: { headerLabel: "", isCloseable: false },
+ }
: {};
component = (
@@ -301,6 +304,7 @@ const Sdk = ({
currentFolderId={frameConfig?.id}
openRoot={selectorOpenRoot}
descriptionText={formatsDescription[frameConfig?.filterParam] || ""}
+ headerProps={{ isCloseable: false }}
/>
);
break;
diff --git a/packages/shared/components/selector/Selector.types.ts b/packages/shared/components/selector/Selector.types.ts
index 41f6dc58af..5cdae0d369 100644
--- a/packages/shared/components/selector/Selector.types.ts
+++ b/packages/shared/components/selector/Selector.types.ts
@@ -74,6 +74,7 @@ export type BreadCrumbsProps = {
export type HeaderProps = {
headerLabel: string;
onCloseClick: () => void;
+ isCloseable?: boolean;
} & THeaderBackButton;
export type TSelectorHeader =
diff --git a/packages/shared/components/selector/sub-components/Header.tsx b/packages/shared/components/selector/sub-components/Header.tsx
index f594d85c58..5a1f75d6bc 100644
--- a/packages/shared/components/selector/sub-components/Header.tsx
+++ b/packages/shared/components/selector/sub-components/Header.tsx
@@ -36,7 +36,9 @@ const Header = React.memo(
withoutBackButton,
headerLabel,
withoutBorder,
+ isCloseable,
}: HeaderProps) => {
+ console.log("isCloseable", isCloseable);
return (
);
},
diff --git a/packages/shared/selectors/Files/FilesSelector.types.ts b/packages/shared/selectors/Files/FilesSelector.types.ts
index 9d68481865..a15b528245 100644
--- a/packages/shared/selectors/Files/FilesSelector.types.ts
+++ b/packages/shared/selectors/Files/FilesSelector.types.ts
@@ -28,6 +28,7 @@ import { TSelectorItem } from "../../components/selector";
import {
TBreadCrumb,
TInfoBar,
+ TSelectorHeader,
} from "../../components/selector/Selector.types";
import {
TFileSecurity,
@@ -143,7 +144,8 @@ export type TSelectedFileInfo = {
export type TGetIcon = (size: number, fileExst: string) => string;
-export type FilesSelectorProps = TInfoBar &
+export type FilesSelectorProps = TSelectorHeader &
+ TInfoBar &
(
| {
getIcon: TGetIcon;
diff --git a/packages/shared/selectors/Files/index.tsx b/packages/shared/selectors/Files/index.tsx
index 1efe4e7e42..d038133895 100644
--- a/packages/shared/selectors/Files/index.tsx
+++ b/packages/shared/selectors/Files/index.tsx
@@ -114,6 +114,7 @@ const FilesSelectorComponent = ({
createDefineRoomType,
withInfoBar,
infoBarData,
+ headerProps,
}: FilesSelectorProps) => {
const theme = useTheme();
const { t } = useTranslation(["Common"]);
@@ -475,10 +476,14 @@ const FilesSelectorComponent = ({
openRoot,
]);
- const headerProps: TSelectorHeader = withHeader
+ const headerSelectorProps: TSelectorHeader = withHeader
? {
withHeader,
- headerProps: { headerLabel, onCloseClick: onCancel },
+ headerProps: {
+ ...headerProps,
+ headerLabel,
+ onCloseClick: onCancel,
+ },
}
: {};
@@ -556,7 +561,7 @@ const FilesSelectorComponent = ({
const SelectorBody = (