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

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

Browse Source
This commit is contained in:
Ilya Oleshko 2022-06-21 17:11:37 +03:00
commit 34a8fa93c0
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packages/asc-web-common/components/FilterInput/index.js
View File

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

2
products/ASC.Files/Client/src/HOCs/withHotkeys.js
View File

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