Merge branch 'develop' into feature/shared-article

2024-01-23 10:12:08 +03:00 · 2024-01-23 10:12:08 +03:00 · 0da84ca486
commit 0da84ca486
parent 0754fb58e0 9690fce42d
8 changed files with 8 additions and 6 deletions
--- a/packages/client/src/HOCs/withFileActions.js
+++ b/packages/client/src/HOCs/withFileActions.js
@ -203,7 +203,7 @@ export default function withFileActions(WrappedFileItem) {
        item.foldersCount === 0
      ) {
        setParentId(item.parentId);
-        setRoomType(item.roomType);
+        // setRoomType(item.roomType);
      }

      openFileAction(item);
--- a/packages/client/src/components/panels/ChangeRoomOwnerPanel/index.js
+++ b/packages/client/src/components/panels/ChangeRoomOwnerPanel/index.js
@ -159,7 +159,7 @@ export default inject(

    const { currentDeviceType } = settingsStore;

-    const { id } = user;
+    const { id } = userStore.user;

    return {
      visible: changeRoomOwnerIsVisible,
--- a/packages/client/src/store/ProfileActionsStore.js
+++ b/packages/client/src/store/ProfileActionsStore.js
@ -124,7 +124,7 @@ class ProfileActionsStore {
  };

  onSpacesClick = () => {
-    this.selectedFolderStore.setSelectedFolder(null);
+    // this.selectedFolderStore.setSelectedFolder(null);
    window.open(SPACES_URL, "_blank");
  };

--- a/packages/shared/components/combobox/ComboBox.tsx
+++ b/packages/shared/components/combobox/ComboBox.tsx
@ -273,6 +273,7 @@ const ComboBoxPure = (props: ComboboxProps) => {
          isNoFixedHeightOptions={isNoFixedHeightOptions}
          forceCloseClickOutside={forceCloseClickOutside}
          withoutBackground={withoutBackground}
+          eventTypes={["click"]}
        >
          {dropDownBody}
        </DropDown>
--- a/packages/shared/components/modal-dialog/sub-components/Modal.tsx
+++ b/packages/shared/components/modal-dialog/sub-components/Modal.tsx
@ -228,7 +228,7 @@ const Modal = ({
            ) : container &&
              containerVisible &&
              currentDisplayType !== "modal" ? (
-              { containerComponent }
+              containerComponent
            ) : (
              <FormWrapper withForm={withForm || false}>
                {header && (
--- a/packages/shared/components/navigation/Navigation.tsx
+++ b/packages/shared/components/navigation/Navigation.tsx
@ -227,6 +227,7 @@ const Navigation = ({
            {withLogo && (
              <NavigationLogo
                className="navigation-logo"
+                logo={typeof withLogo === "string" ? withLogo : ""}
                burgerLogo={burgerLogo}
              />
            )}
--- a/packages/shared/components/navigation/Navigation.types.ts
+++ b/packages/shared/components/navigation/Navigation.types.ts
@ -88,7 +88,7 @@ export interface INavigationItemProps {
  isRoot: boolean;
  isRootRoom: boolean;
  onClick: TOnNavigationItemClick;
-  withLogo: boolean;
+  withLogo: boolean | string;
  currentDeviceType: DeviceType;
  style?: React.CSSProperties;
 }
--- a/packages/shared/components/table/TableHeader.tsx
+++ b/packages/shared/components/table/TableHeader.tsx
@ -1297,7 +1297,7 @@ class TableHeader extends React.Component<

      if (hideColumns !== hideColumnsConst) {
        this.setState({ hideColumns: hideColumnsConst });
-        setHideColumns(hideColumns);
+        setHideColumns(hideColumnsConst);
      }

      if (hideColumns) {