Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
This commit is contained in:
commit
34a8fa93c0
@ -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,22 +73,6 @@ const FilterInput = React.memo(
|
|||||||
onFilter={onFilter}
|
onFilter={onFilter}
|
||||||
headerLabel={headerLabel}
|
headerLabel={headerLabel}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{(viewSettings &&
|
|
||||||
!isMobile &&
|
|
||||||
viewSelectorVisible &&
|
|
||||||
!isMobileUtils() &&
|
|
||||||
!isTabletUtils() &&
|
|
||||||
viewAs !== "row") ||
|
|
||||||
isRecentFolder ? (
|
|
||||||
<ViewSelector
|
|
||||||
style={{ marginLeft: "8px" }}
|
|
||||||
onChangeView={onChangeViewAs}
|
|
||||||
viewAs={viewAs === "table" ? "row" : viewAs}
|
|
||||||
viewSettings={viewSettings}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
{(isMobile ||
|
{(isMobile ||
|
||||||
isTabletUtils() ||
|
isTabletUtils() ||
|
||||||
isMobileUtils() ||
|
isMobileUtils() ||
|
||||||
@ -102,10 +85,24 @@ const FilterInput = React.memo(
|
|||||||
viewAs={viewAs === "table" ? "row" : viewAs}
|
viewAs={viewAs === "table" ? "row" : viewAs}
|
||||||
viewSettings={viewSettings}
|
viewSettings={viewSettings}
|
||||||
onSort={onSort}
|
onSort={onSort}
|
||||||
viewSelectorVisible={viewSelectorVisible}
|
viewSelectorVisible={
|
||||||
|
viewSelectorVisible &&
|
||||||
|
(isMobile || isMobileUtils() || isTabletUtils())
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</>
|
{((viewSettings &&
|
||||||
|
!isMobile &&
|
||||||
|
viewSelectorVisible &&
|
||||||
|
!isMobileUtils() &&
|
||||||
|
!isTabletUtils()) ||
|
||||||
|
isRecentFolder) && (
|
||||||
|
<ViewSelector
|
||||||
|
style={{ marginLeft: "8px" }}
|
||||||
|
onChangeView={onChangeViewAs}
|
||||||
|
viewAs={viewAs === "table" ? "row" : viewAs}
|
||||||
|
viewSettings={viewSettings}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
</StyledFilterInput>
|
</StyledFilterInput>
|
||||||
);
|
);
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user