diff --git a/src/admin/components/elements/DocumentDrawer/index.scss b/src/admin/components/elements/DocumentDrawer/index.scss index 3429ec342f..665daf7f96 100644 --- a/src/admin/components/elements/DocumentDrawer/index.scss +++ b/src/admin/components/elements/DocumentDrawer/index.scss @@ -24,8 +24,10 @@ &__toggler { background: transparent; border: 0; + margin: 0; padding: 0; cursor: pointer; + color: inherit; &:focus, &:focus-within { diff --git a/src/admin/components/elements/ListDrawer/index.scss b/src/admin/components/elements/ListDrawer/index.scss index d4f14946b7..814da1443a 100644 --- a/src/admin/components/elements/ListDrawer/index.scss +++ b/src/admin/components/elements/ListDrawer/index.scss @@ -41,6 +41,7 @@ border: 0; padding: 0; cursor: pointer; + color: inherit; &:focus, &:focus-within { @@ -56,6 +57,7 @@ border: 0; background-color: transparent; padding: 0; + margin: 0; cursor: pointer; overflow: hidden; width: base(1); diff --git a/src/admin/components/forms/field-types/Relationship/select-components/MultiValueLabel/index.scss b/src/admin/components/forms/field-types/Relationship/select-components/MultiValueLabel/index.scss index 66a9470d55..234b556624 100644 --- a/src/admin/components/forms/field-types/Relationship/select-components/MultiValueLabel/index.scss +++ b/src/admin/components/forms/field-types/Relationship/select-components/MultiValueLabel/index.scss @@ -24,6 +24,7 @@ align-items: center; justify-content: center; margin-left: base(0.25); + pointer-events: all; .icon { width: base(0.75); diff --git a/src/admin/components/forms/field-types/Relationship/select-components/SingleValue/index.scss b/src/admin/components/forms/field-types/Relationship/select-components/SingleValue/index.scss index 0b29ca4f03..a19adfe26c 100644 --- a/src/admin/components/forms/field-types/Relationship/select-components/SingleValue/index.scss +++ b/src/admin/components/forms/field-types/Relationship/select-components/SingleValue/index.scss @@ -25,6 +25,7 @@ align-items: center; justify-content: center; margin-left: base(0.25); + pointer-events: all; .icon { width: base(0.75); diff --git a/src/admin/components/forms/field-types/RichText/RichText.tsx b/src/admin/components/forms/field-types/RichText/RichText.tsx index ccb31afdae..4c87207894 100644 --- a/src/admin/components/forms/field-types/RichText/RichText.tsx +++ b/src/admin/components/forms/field-types/RichText/RichText.tsx @@ -205,9 +205,8 @@ const RichText: React.FC = (props) => { function setClickableState(clickState: 'disabled' | 'enabled') { const selectors = 'button, a, [role="button"]'; const toolbarButtons: (HTMLButtonElement | HTMLAnchorElement)[] = toolbarRef.current?.querySelectorAll(selectors); - const editorButtons: (HTMLButtonElement | HTMLAnchorElement)[] = editorRef.current?.querySelectorAll(selectors); - [...(toolbarButtons || []), ...(editorButtons || [])].forEach((child) => { + (toolbarButtons || []).forEach((child) => { const isButton = child.tagName === 'BUTTON'; const isDisabling = clickState === 'disabled'; child.setAttribute('tabIndex', isDisabling ? '-1' : '0'); diff --git a/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.scss b/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.scss index 02c1fa02e3..2586ac446c 100644 --- a/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.scss +++ b/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.scss @@ -49,46 +49,42 @@ outline: none; } - &__toggler { - background: transparent; - border: none; - padding: 0; - cursor: pointer; - - &:focus, - &:focus-within { - outline: none; - } - - &:disabled { - pointer-events: none; - } - } - &__actions { display: flex; align-items: center; flex-shrink: 0; margin-left: base(0.5); + .rich-text-relationship__doc-drawer-toggler { + pointer-events: all; + } + & > *:not(:last-child) { margin-right: base(.25); } } - &__actionButton { + &__removeButton { margin: 0; - border-radius: 0; - flex-shrink: 0; - width: base(1); - height: base(1); line { stroke-width: $style-stroke-width-m; } &:disabled { - opacity: 0.5; + color: var(--theme-elevation-300); + pointer-events: none; + } + } + + &__doc-drawer-toggler, + &__list-drawer-toggler { + & > * { + margin: 0; + } + + &:disabled { + color: var(--theme-elevation-300); pointer-events: none; } } diff --git a/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.tsx b/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.tsx index 2a23e8d81f..8079e357c9 100644 --- a/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.tsx +++ b/src/admin/components/forms/field-types/RichText/elements/relationship/Element/index.tsx @@ -28,9 +28,13 @@ const Element: React.FC<{ attributes, children, element, + element: { + relationTo, + value, + }, fieldProps, } = props; - const { relationTo, value } = element; + const { collections, serverURL, routes: { api } } = useConfig(); const [enabledCollectionSlugs] = useState(() => collections.filter(({ admin: { enableRichTextRelationship } }) => enableRichTextRelationship).map(({ slug }) => slug)); const [relatedCollection, setRelatedCollection] = useState(() => collections.find((coll) => coll.slug === relationTo)); @@ -146,30 +150,27 @@ const Element: React.FC<{
{value?.id && ( - +
{value?.id && ( - +