mirror of
https://github.com/haiwen/seahub.git
synced 2025-08-17 22:47:59 +00:00
Merge pull request #7591 from haiwen/fix/dropdown_menu_position
fix dropdown menu position
This commit is contained in:
commit
890183fe6c
@ -189,8 +189,7 @@ const CustomDropdownMenu = ({ column, modifiers, onSelect }) => {
|
|||||||
}, [onSelect]);
|
}, [onSelect]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalPortal>
|
<DropdownMenu className="sf-metadata-column-type-dropdown-menu" modifiers={modifiers} style={{ zIndex: 1061 }}>
|
||||||
<DropdownMenu className="sf-metadata-column-type-dropdown-menu" modifiers={modifiers}>
|
|
||||||
<div className="search-column-container">
|
<div className="search-column-container">
|
||||||
<Input onChange={onSearchColumn} placeholder={gettext('Search properties')} value={searchValue} onClick={onSearchClick} ref={inputRef} />
|
<Input onChange={onSearchColumn} placeholder={gettext('Search properties')} value={searchValue} onClick={onSearchClick} ref={inputRef} />
|
||||||
</div>
|
</div>
|
||||||
@ -226,7 +225,7 @@ const CustomDropdownMenu = ({ column, modifiers, onSelect }) => {
|
|||||||
<span className="mr-auto">{gettext('Custom properties')}</span>
|
<span className="mr-auto">{gettext('Custom properties')}</span>
|
||||||
<i className="sf3-font-down sf3-font rotate-270"></i>
|
<i className="sf3-font-down sf3-font rotate-270"></i>
|
||||||
</DropdownToggle>
|
</DropdownToggle>
|
||||||
<DropdownMenu container="body" style={{ zIndex: 1061 }}>
|
<DropdownMenu>
|
||||||
{basicsColumns.map((item, index) => (
|
{basicsColumns.map((item, index) => (
|
||||||
<DropdownItem
|
<DropdownItem
|
||||||
key={index}
|
key={index}
|
||||||
@ -244,7 +243,6 @@ const CustomDropdownMenu = ({ column, modifiers, onSelect }) => {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</DropdownMenu>
|
</DropdownMenu>
|
||||||
</ModalPortal>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
|
|||||||
import classnames from 'classnames';
|
import classnames from 'classnames';
|
||||||
import { gettext } from '../../../../../utils/constants';
|
import { gettext } from '../../../../../utils/constants';
|
||||||
import CustomDropdownMenu from '../dropdown-menu';
|
import CustomDropdownMenu from '../dropdown-menu';
|
||||||
|
import ModalPortal from '../../../../../components/modal-portal';
|
||||||
|
|
||||||
import './index.css';
|
import './index.css';
|
||||||
|
|
||||||
@ -54,6 +55,7 @@ const Type = forwardRef(({ column, onChange }, ref) => {
|
|||||||
<span className="mr-auto">{column.name}</span>
|
<span className="mr-auto">{column.name}</span>
|
||||||
<i className="sf3-font sf3-font-down" aria-hidden="true"></i>
|
<i className="sf3-font sf3-font-down" aria-hidden="true"></i>
|
||||||
</DropdownToggle>
|
</DropdownToggle>
|
||||||
|
<ModalPortal>
|
||||||
<CustomDropdownMenu
|
<CustomDropdownMenu
|
||||||
column={column}
|
column={column}
|
||||||
modifiers={[{
|
modifiers={[{
|
||||||
@ -64,6 +66,7 @@ const Type = forwardRef(({ column, onChange }, ref) => {
|
|||||||
}]}
|
}]}
|
||||||
onSelect={onChange}
|
onSelect={onChange}
|
||||||
/>
|
/>
|
||||||
|
</ModalPortal>
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
{error && (<FormFeedback>{error}</FormFeedback>)}
|
{error && (<FormFeedback>{error}</FormFeedback>)}
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
|
Loading…
Reference in New Issue
Block a user