FIX - TASKER UI: dropdown-свойства поверх карточки
This commit is contained in:
@@ -125,9 +125,9 @@ export const CycleOptions = observer(function CycleOptions(props: CycleOptionsPr
|
|||||||
query === "" ? options : options?.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));
|
query === "" ? options : options?.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Combobox.Options className="fixed z-10" static>
|
<Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
|
||||||
<div
|
<div
|
||||||
className="nodedc-dropdown-surface z-30 my-1 w-52"
|
className="nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 w-52"
|
||||||
ref={setPopperElement}
|
ref={setPopperElement}
|
||||||
style={styles.popper}
|
style={styles.popper}
|
||||||
{...attributes.popper}
|
{...attributes.popper}
|
||||||
|
|||||||
@@ -232,9 +232,9 @@ export const EstimateDropdown = observer(function EstimateDropdown(props: Props)
|
|||||||
renderByDefault={renderByDefault}
|
renderByDefault={renderByDefault}
|
||||||
>
|
>
|
||||||
{isOpen && (
|
{isOpen && (
|
||||||
<Combobox.Options className="fixed z-10" static>
|
<Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
|
||||||
<div
|
<div
|
||||||
className="nodedc-dropdown-surface z-30 my-1 w-52"
|
className="nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 w-52"
|
||||||
ref={setPopperElement}
|
ref={setPopperElement}
|
||||||
style={styles.popper}
|
style={styles.popper}
|
||||||
{...attributes.popper}
|
{...attributes.popper}
|
||||||
@@ -269,14 +269,11 @@ export const EstimateDropdown = observer(function EstimateDropdown(props: Props)
|
|||||||
<Combobox.Option key={option.value} value={option.value}>
|
<Combobox.Option key={option.value} value={option.value}>
|
||||||
{({ active, selected }) => (
|
{({ active, selected }) => (
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn("nodedc-dropdown-option", {
|
||||||
"nodedc-dropdown-option",
|
"bg-white/6": active,
|
||||||
{
|
"text-primary": selected,
|
||||||
"bg-white/6": active,
|
"text-secondary": !selected,
|
||||||
"text-primary": selected,
|
})}
|
||||||
"text-secondary": !selected,
|
|
||||||
}
|
|
||||||
)}
|
|
||||||
>
|
>
|
||||||
<span className="flex-grow truncate">{option.content}</span>
|
<span className="flex-grow truncate">{option.content}</span>
|
||||||
{selected && <CheckIcon className="h-3.5 w-3.5 flex-shrink-0" />}
|
{selected && <CheckIcon className="h-3.5 w-3.5 flex-shrink-0" />}
|
||||||
|
|||||||
@@ -113,9 +113,9 @@ export const ModuleOptions = observer(function ModuleOptions(props: Props) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Combobox.Options className="fixed z-10" static>
|
<Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
|
||||||
<div
|
<div
|
||||||
className="nodedc-dropdown-surface z-30 my-1 w-52"
|
className="nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 w-52"
|
||||||
ref={setPopperElement}
|
ref={setPopperElement}
|
||||||
style={styles.popper}
|
style={styles.popper}
|
||||||
{...attributes.popper}
|
{...attributes.popper}
|
||||||
@@ -141,14 +141,11 @@ export const ModuleOptions = observer(function ModuleOptions(props: Props) {
|
|||||||
key={option.value}
|
key={option.value}
|
||||||
value={option.value}
|
value={option.value}
|
||||||
className={({ active, selected }) =>
|
className={({ active, selected }) =>
|
||||||
cn(
|
cn("nodedc-dropdown-option", {
|
||||||
"nodedc-dropdown-option",
|
"bg-white/6": active,
|
||||||
{
|
"text-primary": selected,
|
||||||
"bg-white/6": active,
|
"text-secondary": !selected,
|
||||||
"text-primary": selected,
|
})
|
||||||
"text-secondary": !selected,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{({ selected }) => (
|
{({ selected }) => (
|
||||||
|
|||||||
+3
-3
@@ -252,9 +252,9 @@ export function LabelDropdown(props: ILabelDropdownProps) {
|
|||||||
multiple
|
multiple
|
||||||
>
|
>
|
||||||
{isOpen && (
|
{isOpen && (
|
||||||
<Combobox.Options className="fixed z-10" static>
|
<Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
|
||||||
<div
|
<div
|
||||||
className={`nodedc-dropdown-surface z-10 my-1 h-auto w-52 whitespace-nowrap ${optionsClassName}`}
|
className={`nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 h-auto w-52 whitespace-nowrap ${optionsClassName}`}
|
||||||
ref={setPopperElement}
|
ref={setPopperElement}
|
||||||
style={styles.popper}
|
style={styles.popper}
|
||||||
{...attributes.popper}
|
{...attributes.popper}
|
||||||
@@ -263,7 +263,7 @@ export function LabelDropdown(props: ILabelDropdownProps) {
|
|||||||
<SearchIcon className="h-3.5 w-3.5 text-tertiary" />
|
<SearchIcon className="h-3.5 w-3.5 text-tertiary" />
|
||||||
<Combobox.Input
|
<Combobox.Input
|
||||||
ref={inputRef}
|
ref={inputRef}
|
||||||
className="w-full bg-transparent px-0 py-0 text-12 text-secondary placeholder:text-placeholder outline-none focus:outline-none"
|
className="w-full bg-transparent px-0 py-0 text-12 text-secondary outline-none placeholder:text-placeholder focus:outline-none"
|
||||||
value={query}
|
value={query}
|
||||||
onChange={(e) => setQuery(e.target.value)}
|
onChange={(e) => setQuery(e.target.value)}
|
||||||
placeholder={t("common.search.label")}
|
placeholder={t("common.search.label")}
|
||||||
|
|||||||
Reference in New Issue
Block a user