Fix Bug 57381 - Mobile.Client. The sort menu by the vertical orientation of the phone does not open in the Favorites / Recent folders

This commit is contained in:
Timofey Boyko 2022-05-30 11:50:16 +03:00
parent 86d49a54a7
commit d5dabdc182
2 changed files with 33 additions and 48 deletions

View File

@ -76,12 +76,13 @@ const FilterInput = React.memo(
headerLabel={headerLabel}
/>
{viewSettings &&
!isMobile &&
viewSelectorVisible &&
!isMobileUtils() &&
!isTabletUtils() &&
viewAs !== "row" ? (
{(viewSettings &&
!isMobile &&
viewSelectorVisible &&
!isMobileUtils() &&
!isTabletUtils() &&
viewAs !== "row") ||
isRecentFolder ? (
<ViewSelector
style={{ marginLeft: "8px" }}
onChangeView={onChangeViewAs}
@ -103,8 +104,6 @@ const FilterInput = React.memo(
viewSettings={viewSettings}
onSort={onSort}
viewSelectorVisible={viewSelectorVisible}
isRecentFolder={isRecentFolder}
isFavoritesFolder={isFavoritesFolder}
/>
)}
</>

View File

@ -32,18 +32,13 @@ const notSelectedViewIcon = css`
`;
const mobileView = css`
${(props) =>
!props.isRecentFolder &&
!props.isFavoritesFolder &&
css`
position: fixed;
top: auto;
left: 0;
bottom: 0;
width: 100vw;
position: fixed;
top: auto;
left: 0;
bottom: 0;
width: 100vw;
z-index: 999;
`}
z-index: 999;
`;
const StyledSortButton = styled.div`
@ -184,8 +179,6 @@ const SortButton = ({
viewSettings,
onSort,
viewSelectorVisible,
isRecentFolder,
isFavoritesFolder,
}) => {
const [isOpen, setIsOpen] = React.useState(false);
@ -226,8 +219,6 @@ const SortButton = ({
[onSort, toggleCombobox, currentSelectedFilterData]
);
const getSortOption = () => {};
const getAdvancedOptions = React.useCallback(() => {
const data = getSortData();
@ -253,30 +244,28 @@ const SortButton = ({
viewSettings={viewSettings}
/>
</DropDownItem>
{!isRecentFolder && (
<DropDownItem isSeparator={true}></DropDownItem>
)}
</>
)}
{!isRecentFolder && (
<>
{data.map((item, index) => (
<DropDownItem
onClick={onOptionClick}
className={item.className}
key={item.key}
data-value={item.key}
>
<Text fontWeight={600}>{item.label}</Text>
<SortDesc
className={`option-item__icon ${
item.isSelected ? "selected-option-item__icon" : ""
}`}
/>
</DropDownItem>
))}
<DropDownItem isSeparator={true}></DropDownItem>
</>
)}
<>
{data.map((item, index) => (
<DropDownItem
onClick={onOptionClick}
className={item.className}
key={item.key}
data-value={item.key}
>
<Text fontWeight={600}>{item.label}</Text>
<SortDesc
className={`option-item__icon ${
item.isSelected ? "selected-option-item__icon" : ""
}`}
/>
</DropDownItem>
))}
</>
</>
);
}, [
@ -286,7 +275,6 @@ const SortButton = ({
viewAs,
viewSettings,
getSortData,
isRecentFolder,
]);
return (
@ -301,8 +289,6 @@ const SortButton = ({
viewAs={viewAs}
isDesc={currentSelectedFilterData.sortDirection === "desc"}
onClick={toggleCombobox}
isRecentFolder={isRecentFolder}
isFavoritesFolder={isFavoritesFolder}
>
<ComboBox
opened={isOpen}