Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

packages/asc-web-common/components/FilterInput/index.js

@@ -65,7 +65,6 @@ const FilterInput = React.memo(
           onChange={onSearch}
           onClearSearch={onClearSearch}
         />
-
         <FilterButton
           t={t}
           selectedFilterData={selectedFilterData}
@@ -74,38 +73,36 @@ const FilterInput = React.memo(
           onFilter={onFilter}
           headerLabel={headerLabel}
         />
-
-        {(viewSettings &&
+        {(isMobile ||
+          isTabletUtils() ||
+          isMobileUtils() ||
+          viewAs === "row") && (
+          <SortButton
+            t={t}
+            selectedFilterData={selectedFilterData}
+            getSortData={getSortData}
+            onChangeViewAs={onChangeViewAs}
+            viewAs={viewAs === "table" ? "row" : viewAs}
+            viewSettings={viewSettings}
+            onSort={onSort}
+            viewSelectorVisible={
+              viewSelectorVisible &&
+              (isMobile || isMobileUtils() || isTabletUtils())
+            }
+          />
+        )}
+        {((viewSettings &&
           !isMobile &&
           viewSelectorVisible &&
           !isMobileUtils() &&
-          !isTabletUtils() &&
-          viewAs !== "row") ||
-        isRecentFolder ? (
+          !isTabletUtils()) ||
+          isRecentFolder) && (
           <ViewSelector
             style={{ marginLeft: "8px" }}
             onChangeView={onChangeViewAs}
             viewAs={viewAs === "table" ? "row" : viewAs}
             viewSettings={viewSettings}
           />
-        ) : (
-          <>
-            {(isMobile ||
-              isTabletUtils() ||
-              isMobileUtils() ||
-              viewAs === "row") && (
-              <SortButton
-                t={t}
-                selectedFilterData={selectedFilterData}
-                getSortData={getSortData}
-                onChangeViewAs={onChangeViewAs}
-                viewAs={viewAs === "table" ? "row" : viewAs}
-                viewSettings={viewSettings}
-                onSort={onSort}
-                viewSelectorVisible={viewSelectorVisible}
-              />
-            )}
-          </>
         )}
       </StyledFilterInput>
     );

products/ASC.Files/Client/src/HOCs/withHotkeys.js

@@ -156,7 +156,7 @@ const withHotkeys = (Component) => {
     useHotkeys(
       "Shift+d",
       () => setAction({ type: FileAction.Create, extension: "docx", id: -1 }),
-      hotkeysFilter
+      { ...hotkeysFilter, ...{ keyup: true } }
     );
 
     //Crete spreadsheet