fix
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
import { EditIcon, IconX, PlusIcon } from '../ui/icons';
|
import { EditIcon, IconX, PlusIcon } from '../ui/icons';
|
||||||
import QuickAddMenu from '../ui/QuickAddMenu';
|
import SelectionAssignmentMenu from './SelectionAssignmentMenu';
|
||||||
import { getTagColorStyle } from '../utils/colors';
|
import { getTagColorStyle } from '../utils/colors';
|
||||||
import {
|
import {
|
||||||
formatDate,
|
formatDate,
|
||||||
@@ -34,6 +34,29 @@ export const buildCorrespondentOptions = (entries = []) => {
|
|||||||
|
|
||||||
const normalizeOptions = (options) => (Array.isArray(options) ? options : []);
|
const normalizeOptions = (options) => (Array.isArray(options) ? options : []);
|
||||||
|
|
||||||
|
const normalizeQuickAddOption = (option) => {
|
||||||
|
if (option == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (typeof option === 'string') {
|
||||||
|
const label = option.trim();
|
||||||
|
return label ? { id: label, label, original: option } : null;
|
||||||
|
}
|
||||||
|
const label = typeof option.label === 'string'
|
||||||
|
? option.label.trim()
|
||||||
|
: typeof option.name === 'string'
|
||||||
|
? option.name.trim()
|
||||||
|
: '';
|
||||||
|
if (!label) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
id: option.id ?? label,
|
||||||
|
label,
|
||||||
|
original: option,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const TagSection = ({
|
export const TagSection = ({
|
||||||
tags = [],
|
tags = [],
|
||||||
onRemove,
|
onRemove,
|
||||||
@@ -63,10 +86,71 @@ export const TagSection = ({
|
|||||||
[onAdd],
|
[onAdd],
|
||||||
);
|
);
|
||||||
|
|
||||||
const normalizedOptions = useMemo(() => normalizeOptions(datalistOptions), [datalistOptions]);
|
const normalizedOptions = useMemo(
|
||||||
|
() =>
|
||||||
|
normalizeOptions(datalistOptions)
|
||||||
|
.map((option) => normalizeQuickAddOption(option))
|
||||||
|
.filter(Boolean),
|
||||||
|
[datalistOptions],
|
||||||
|
);
|
||||||
const containerClass = className ? `tag-list ${className}` : 'tag-list';
|
const containerClass = className ? `tag-list ${className}` : 'tag-list';
|
||||||
const showQuickAdd = Boolean(onAdd);
|
const showQuickAdd = Boolean(onAdd);
|
||||||
|
|
||||||
|
const assignmentItems = useMemo(() => {
|
||||||
|
const map = new Map();
|
||||||
|
|
||||||
|
normalizedOptions.forEach((option) => {
|
||||||
|
const label = option?.label?.trim();
|
||||||
|
if (!label) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const key = label.toLowerCase();
|
||||||
|
if (map.has(key)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
map.set(key, {
|
||||||
|
id: option.id ?? label,
|
||||||
|
label,
|
||||||
|
state: 'none',
|
||||||
|
payload: option.original ?? { label },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
tags.forEach((tag) => {
|
||||||
|
const label = typeof tag?.label === 'string' ? tag.label.trim() : '';
|
||||||
|
if (!label) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const key = label.toLowerCase();
|
||||||
|
const payload = { id: tag.id, label, color: tag.color ?? null };
|
||||||
|
if (map.has(key)) {
|
||||||
|
const entry = map.get(key);
|
||||||
|
entry.state = 'all';
|
||||||
|
entry.payload = payload;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
map.set(key, {
|
||||||
|
id: tag.id ?? label,
|
||||||
|
label,
|
||||||
|
state: 'all',
|
||||||
|
payload,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return Array.from(map.values());
|
||||||
|
}, [normalizedOptions, tags]);
|
||||||
|
|
||||||
|
const handleAssignmentSelect = useCallback(
|
||||||
|
(item) => {
|
||||||
|
if (!item) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const payload = item.payload ?? { label: item.label };
|
||||||
|
handleSelect(payload);
|
||||||
|
},
|
||||||
|
[handleSelect],
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={containerClass}>
|
<div className={containerClass}>
|
||||||
{tags.map((tag) => {
|
{tags.map((tag) => {
|
||||||
@@ -89,14 +173,17 @@ export const TagSection = ({
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
{showQuickAdd ? (
|
{showQuickAdd ? (
|
||||||
<QuickAddMenu
|
<SelectionAssignmentMenu
|
||||||
options={normalizedOptions}
|
label="Add tag"
|
||||||
onCreate={handleCreate}
|
items={assignmentItems}
|
||||||
onSelectOption={(original, normalized) => handleSelect(normalized || original)}
|
|
||||||
placeholder={addPlaceholder}
|
placeholder={addPlaceholder}
|
||||||
|
emptyMessage="No tags"
|
||||||
createLabel={addButtonLabel}
|
createLabel={addButtonLabel}
|
||||||
triggerAriaLabel="Add tag"
|
onToggle={handleAssignmentSelect}
|
||||||
triggerTitle={addButtonLabel}
|
onCreate={handleCreate}
|
||||||
|
showStateIndicators
|
||||||
|
showCounts={false}
|
||||||
|
positionStrategy="fixed"
|
||||||
triggerClassName="quick-add__chip quick-add__trigger"
|
triggerClassName="quick-add__chip quick-add__trigger"
|
||||||
triggerContent={(
|
triggerContent={(
|
||||||
<span className="quick-add__chip-label">
|
<span className="quick-add__chip-label">
|
||||||
@@ -125,31 +212,82 @@ export const CorrespondentSection = ({
|
|||||||
[onAdd],
|
[onAdd],
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleSelect = useCallback(
|
const normalizedOptions = useMemo(
|
||||||
(original, normalized) => {
|
() =>
|
||||||
if (!onAdd) return;
|
normalizeOptions(datalistOptions)
|
||||||
const source = normalized && typeof normalized === 'object' ? normalized : original;
|
.map((option) => normalizeQuickAddOption(option))
|
||||||
|
.filter(Boolean),
|
||||||
|
[datalistOptions],
|
||||||
|
);
|
||||||
|
const hasEntries = entries && entries.length > 0;
|
||||||
|
const showQuickAdd = Boolean(onAdd);
|
||||||
|
const containerClass = className ? `correspondent-list ${className}` : 'correspondent-list';
|
||||||
|
|
||||||
|
const assignmentItems = useMemo(() => {
|
||||||
|
const map = new Map();
|
||||||
|
|
||||||
|
normalizedOptions.forEach((option) => {
|
||||||
|
const label = option?.label?.trim();
|
||||||
|
if (!label) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const key = label.toLowerCase();
|
||||||
|
if (map.has(key)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
map.set(key, {
|
||||||
|
id: option.id ?? label,
|
||||||
|
label,
|
||||||
|
state: 'none',
|
||||||
|
payload: option.original ?? { name: label },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
entries.forEach((entry) => {
|
||||||
|
const label = typeof entry?.name === 'string' ? entry.name.trim() : '';
|
||||||
|
if (!label) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const key = label.toLowerCase();
|
||||||
|
const payload = { id: entry.id, name: label };
|
||||||
|
if (map.has(key)) {
|
||||||
|
const item = map.get(key);
|
||||||
|
item.state = 'all';
|
||||||
|
item.payload = payload;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
map.set(key, {
|
||||||
|
id: entry.id ?? label,
|
||||||
|
label,
|
||||||
|
state: 'all',
|
||||||
|
payload,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return Array.from(map.values());
|
||||||
|
}, [normalizedOptions, entries]);
|
||||||
|
|
||||||
|
const handleAssignmentSelect = useCallback(
|
||||||
|
(item) => {
|
||||||
|
if (!onAdd || !item) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const source = item.payload ?? item;
|
||||||
const resolvedName =
|
const resolvedName =
|
||||||
(source && typeof source.name === 'string' && source.name.trim()) ||
|
(source && typeof source.name === 'string' && source.name.trim())
|
||||||
(typeof source === 'string' ? source.trim() : '') ||
|
|| (typeof source === 'string' ? source.trim() : '')
|
||||||
(source && typeof source.label === 'string' ? source.label.trim() : '');
|
|| (source && typeof source.label === 'string' ? source.label.trim() : '');
|
||||||
if (!resolvedName) {
|
if (!resolvedName) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const payload =
|
const payload = typeof source === 'object'
|
||||||
source && typeof source === 'object'
|
? { ...source, name: resolvedName }
|
||||||
? { ...source, name: resolvedName }
|
: { id: null, name: resolvedName };
|
||||||
: { id: null, name: resolvedName };
|
|
||||||
onAdd({ name: resolvedName, option: payload, input: null });
|
onAdd({ name: resolvedName, option: payload, input: null });
|
||||||
},
|
},
|
||||||
[onAdd],
|
[onAdd],
|
||||||
);
|
);
|
||||||
|
|
||||||
const normalizedOptions = useMemo(() => normalizeOptions(datalistOptions), [datalistOptions]);
|
|
||||||
const hasEntries = entries && entries.length > 0;
|
|
||||||
const showQuickAdd = Boolean(onAdd);
|
|
||||||
const containerClass = className ? `correspondent-list ${className}` : 'correspondent-list';
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={containerClass}>
|
<div className={containerClass}>
|
||||||
{hasEntries
|
{hasEntries
|
||||||
@@ -176,14 +314,17 @@ export const CorrespondentSection = ({
|
|||||||
})
|
})
|
||||||
: !showQuickAdd && <span className="meta">No correspondents yet.</span>}
|
: !showQuickAdd && <span className="meta">No correspondents yet.</span>}
|
||||||
{showQuickAdd ? (
|
{showQuickAdd ? (
|
||||||
<QuickAddMenu
|
<SelectionAssignmentMenu
|
||||||
options={normalizedOptions}
|
label="Add correspondent"
|
||||||
onCreate={handleCreate}
|
items={assignmentItems}
|
||||||
onSelectOption={(original, normalized) => handleSelect(original, normalized)}
|
|
||||||
placeholder={addPlaceholder}
|
placeholder={addPlaceholder}
|
||||||
|
emptyMessage="No correspondents"
|
||||||
createLabel={addButtonLabel}
|
createLabel={addButtonLabel}
|
||||||
triggerAriaLabel="Add correspondent"
|
onToggle={handleAssignmentSelect}
|
||||||
triggerTitle={addButtonLabel}
|
onCreate={handleCreate}
|
||||||
|
showStateIndicators
|
||||||
|
showCounts={false}
|
||||||
|
positionStrategy="fixed"
|
||||||
triggerClassName="quick-add__chip quick-add__trigger"
|
triggerClassName="quick-add__chip quick-add__trigger"
|
||||||
triggerContent={(
|
triggerContent={(
|
||||||
<span className="quick-add__chip-label">
|
<span className="quick-add__chip-label">
|
||||||
|
|||||||
@@ -31,10 +31,12 @@ const SelectionAssignmentMenu = ({
|
|||||||
disabled = false,
|
disabled = false,
|
||||||
className,
|
className,
|
||||||
triggerContent = null,
|
triggerContent = null,
|
||||||
|
triggerClassName = 'quick-add__chip quick-add__trigger panel-floating-actions__trigger',
|
||||||
showStateIndicators = true,
|
showStateIndicators = true,
|
||||||
showCounts = true,
|
showCounts = true,
|
||||||
onOpenMenu = null,
|
onOpenMenu = null,
|
||||||
renderItemLabel = null,
|
renderItemLabel = null,
|
||||||
|
positionStrategy = 'absolute',
|
||||||
}) => {
|
}) => {
|
||||||
const anchorRef = useRef(null);
|
const anchorRef = useRef(null);
|
||||||
const inputRef = useRef(null);
|
const inputRef = useRef(null);
|
||||||
@@ -51,7 +53,7 @@ const SelectionAssignmentMenu = ({
|
|||||||
} = useFloatingMenu({
|
} = useFloatingMenu({
|
||||||
anchorRef,
|
anchorRef,
|
||||||
align: 'center',
|
align: 'center',
|
||||||
positionStrategy: 'absolute',
|
positionStrategy,
|
||||||
minWidth: 220,
|
minWidth: 220,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -163,7 +165,7 @@ const SelectionAssignmentMenu = ({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
ref={anchorRef}
|
ref={anchorRef}
|
||||||
className="quick-add__chip quick-add__trigger panel-floating-actions__trigger"
|
className={triggerClassName}
|
||||||
onClick={handleTriggerClick}
|
onClick={handleTriggerClick}
|
||||||
aria-haspopup="menu"
|
aria-haspopup="menu"
|
||||||
aria-expanded={isOpen}
|
aria-expanded={isOpen}
|
||||||
|
|||||||
@@ -236,7 +236,7 @@
|
|||||||
box-shadow: 0 12px 28px var(--shadow-strong);
|
box-shadow: 0 12px 28px var(--shadow-strong);
|
||||||
min-width: 220px;
|
min-width: 220px;
|
||||||
z-index: 2500000;
|
z-index: 2500000;
|
||||||
overflow: hidden;
|
overflow: visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu[data-floating-position] {
|
.menu[data-floating-position] {
|
||||||
|
|||||||
Reference in New Issue
Block a user