From 65e912a75545c08ef82608a337b9b92eda830fbe Mon Sep 17 00:00:00 2001
From: moklick <info@moritzklack.com>
Date: Tue, 3 Jun 2025 14:04:48 +0200
Subject: [PATCH] chore(a11y): cleanup

---
 .../react/src/components/A11yDescriptions/index.tsx   | 11 ++++-------
 packages/react/src/components/NodeWrapper/index.tsx   |  5 +++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/react/src/components/A11yDescriptions/index.tsx b/packages/react/src/components/A11yDescriptions/index.tsx
index 4931ada0..6f08447e 100644
--- a/packages/react/src/components/A11yDescriptions/index.tsx
+++ b/packages/react/src/components/A11yDescriptions/index.tsx
@@ -36,18 +36,15 @@ function AriaLiveMessage({ rfId }: { rfId: string }) {
 export function A11yDescriptions({ rfId, disableKeyboardA11y }: { rfId: string; disableKeyboardA11y: boolean }) {
   const labelConfig = useStore(labelConfigSelector);
 
-  const nodeDesc = disableKeyboardA11y
-    ? labelConfig['a11yDescription.node.default']
-    : labelConfig['a11yDescription.node.keyboardDisabled'];
-  const edgeDesc = labelConfig['a11yDescription.edge.default'];
-
   return (
     <>
       <div id={`${ARIA_NODE_DESC_KEY}-${rfId}`} style={style}>
-        {nodeDesc}
+        {disableKeyboardA11y
+          ? labelConfig['a11yDescription.node.default']
+          : labelConfig['a11yDescription.node.keyboardDisabled']}
       </div>
       <div id={`${ARIA_EDGE_DESC_KEY}-${rfId}`} style={style}>
-        {edgeDesc}
+        {labelConfig['a11yDescription.edge.default']}
       </div>
       {!disableKeyboardA11y && <AriaLiveMessage rfId={rfId} />}
     </>
diff --git a/packages/react/src/components/NodeWrapper/index.tsx b/packages/react/src/components/NodeWrapper/index.tsx
index d53ef414..8ac50a09 100644
--- a/packages/react/src/components/NodeWrapper/index.tsx
+++ b/packages/react/src/components/NodeWrapper/index.tsx
@@ -40,7 +40,7 @@ export function NodeWrapper<NodeType extends Node>({
   nodeClickDistance,
   onError,
 }: NodeWrapperProps<NodeType>) {
-  const { node, internals, isParent, labelConfig } = useStore((s) => {
+  const { node, internals, isParent } = useStore((s) => {
     const node = s.nodeLookup.get(id)! as InternalNode<NodeType>;
     const isParent = s.parentLookup.has(id);
 
@@ -48,7 +48,6 @@ export function NodeWrapper<NodeType extends Node>({
       node,
       internals: node.internals,
       isParent,
-      labelConfig: s.labelConfig,
     };
   }, shallow);
 
@@ -143,6 +142,8 @@ export function NodeWrapper<NodeType extends Node>({
       // prevent default scrolling behavior on arrow key press when node is moved
       event.preventDefault();
 
+      const { labelConfig } = store.getState();
+
       store.setState({
         ariaLiveMessage: labelConfig['a11yDescription.ariaLiveMessage']({
           direction: event.key.replace('Arrow', '').toLowerCase(),