@wordpress/editor 14.35.1-next.16d95556a.0 → 14.36.0

package/build-module/bindings/term-data.js

@@ -6,91 +6,85 @@ var NAVIGATION_BLOCK_TYPES = [
   "core/navigation-link",
   "core/navigation-submenu"
 ];
-function createDataFields(termDataValues, idValue) {
-  return {
-    id: {
-      label: __("Term ID"),
-      value: idValue,
-      type: "string"
-    },
-    name: {
-      label: __("Name"),
-      value: termDataValues?.name,
-      type: "string"
-    },
-    slug: {
-      label: __("Slug"),
-      value: termDataValues?.slug,
-      type: "string"
-    },
-    link: {
-      label: __("Link"),
-      value: termDataValues?.link,
-      type: "string"
-    },
-    description: {
-      label: __("Description"),
-      value: termDataValues?.description,
-      type: "string"
-    },
-    parent: {
-      label: __("Parent ID"),
-      value: termDataValues?.parent,
-      type: "string"
-    },
-    count: {
-      label: __("Count"),
-      value: `(${termDataValues?.count ?? 0})`,
-      type: "string"
-    }
-  };
-}
-function getTermDataFields(select, context, clientId) {
-  const { getEntityRecord } = select(coreDataStore);
-  const { getBlockAttributes, getBlockName } = select(blockEditorStore);
-  let termDataValues, dataFields;
-  const blockName = getBlockName?.(clientId);
-  const isNavigationBlock = NAVIGATION_BLOCK_TYPES.includes(blockName);
-  let termId, taxonomy;
-  if (isNavigationBlock) {
-    const blockAttributes = getBlockAttributes?.(clientId);
-    termId = blockAttributes?.id;
-    const typeFromAttributes = blockAttributes?.type;
-    taxonomy = typeFromAttributes === "tag" ? "post_tag" : typeFromAttributes;
-  } else {
-    termId = context?.termId;
-    taxonomy = context?.taxonomy;
-  }
-  if (taxonomy && termId) {
-    termDataValues = getEntityRecord("taxonomy", taxonomy, termId);
-    if (!termDataValues && context?.termData) {
-      termDataValues = context.termData;
-    }
-    if (termDataValues) {
-      dataFields = createDataFields(termDataValues, termId);
-    }
-  } else if (context?.termData) {
-    termDataValues = context.termData;
-    dataFields = createDataFields(
-      termDataValues,
-      termDataValues?.term_id
-    );
-  }
-  if (!dataFields || !Object.keys(dataFields).length) {
-    return null;
+var termDataFields = [
+  {
+    label: __("Term ID"),
+    args: { field: "id" },
+    type: "string"
+  },
+  {
+    label: __("Name"),
+    args: { field: "name" },
+    type: "string"
+  },
+  {
+    label: __("Slug"),
+    args: { field: "slug" },
+    type: "string"
+  },
+  {
+    label: __("Link"),
+    args: { field: "link" },
+    type: "string"
+  },
+  {
+    label: __("Description"),
+    args: { field: "description" },
+    type: "string"
+  },
+  {
+    label: __("Parent ID"),
+    args: { field: "parent" },
+    type: "string"
+  },
+  {
+    label: __("Count"),
+    args: { field: "count" },
+    type: "string"
   }
-  return dataFields;
-}
+];
 var term_data_default = {
   name: "core/term-data",
   usesContext: ["taxonomy", "termId", "termData"],
   getValues({ select, context, bindings, clientId }) {
-    const dataFields = getTermDataFields(select, context, clientId);
+    const { getEntityRecord } = select(coreDataStore);
+    const { getBlockAttributes, getBlockName } = select(blockEditorStore);
+    const blockName = getBlockName(clientId);
+    const isNavigationBlock = NAVIGATION_BLOCK_TYPES.includes(blockName);
+    let termDataValues;
+    if (isNavigationBlock) {
+      const blockAttributes = getBlockAttributes(clientId);
+      const typeFromAttributes = blockAttributes?.type;
+      const taxonomy = typeFromAttributes === "tag" ? "post_tag" : typeFromAttributes;
+      termDataValues = getEntityRecord(
+        "taxonomy",
+        taxonomy,
+        blockAttributes?.id
+      );
+    } else if (context.termId && context.taxonomy) {
+      termDataValues = getEntityRecord(
+        "taxonomy",
+        context.taxonomy,
+        context.termId
+      );
+    }
+    if (!termDataValues && context?.termData && !isNavigationBlock) {
+      termDataValues = context.termData;
+    }
     const newValues = {};
-    for (const [attributeName, source] of Object.entries(bindings)) {
-      const fieldKey = source.args.field;
-      const { value: fieldValue, label: fieldLabel } = dataFields?.[fieldKey] || {};
-      newValues[attributeName] = fieldValue ?? fieldLabel ?? fieldKey;
+    for (const [attributeName, binding] of Object.entries(bindings)) {
+      const termDataField = termDataFields.find(
+        (field) => field.args.field === binding.args.field
+      );
+      if (!termDataField) {
+        newValues[attributeName] = binding.args.field;
+      } else if (!termDataValues || termDataValues[binding.args.field] === void 0) {
+        newValues[attributeName] = termDataField.label;
+      } else if (binding.args.field === "count") {
+        newValues[attributeName] = "(" + termDataValues[binding.args.field] + ")";
+      } else {
+        newValues[attributeName] = termDataValues[binding.args.field];
+      }
     }
     return newValues;
   },
@@ -98,10 +92,10 @@ var term_data_default = {
   setValues({ dispatch, context, bindings }) {
     return false;
   },
-  canUserEditValue({ select, context, args }) {
+  canUserEditValue({ select, context }) {
     const { getBlockName, getSelectedBlockClientId } = select(blockEditorStore);
     const clientId = getSelectedBlockClientId();
-    const blockName = getBlockName?.(clientId);
+    const blockName = getBlockName(clientId);
     if (NAVIGATION_BLOCK_TYPES.includes(blockName)) {
       return false;
     }
@@ -111,26 +105,30 @@ var term_data_default = {
     if (!context?.taxonomy || !context?.termId) {
       return false;
     }
-    const fieldValue = getTermDataFields(select, context, void 0)?.[args.field]?.value;
-    if (fieldValue === void 0) {
-      return false;
-    }
     return false;
   },
-  getFieldsList({ select, context }) {
-    const clientId = select(blockEditorStore).getSelectedBlockClientId();
-    const termDataFields = getTermDataFields(select, context, clientId);
-    if (!termDataFields) {
+  getFieldsList({ context, select }) {
+    const { getBlockAttributes, getBlockName, getSelectedBlockClientId } = select(blockEditorStore);
+    const clientId = getSelectedBlockClientId();
+    const blockName = getBlockName(clientId);
+    if (NAVIGATION_BLOCK_TYPES.includes(blockName)) {
+      const blockAttributes = getBlockAttributes(clientId);
+      if (!blockAttributes || !blockAttributes.id || !blockAttributes.type) {
+        return [];
+      }
+      return termDataFields;
+    }
+    if (!context) {
       return [];
     }
-    return Object.entries(termDataFields).map(([key, field]) => ({
-      label: field.label,
-      type: field.type,
-      args: { field: key }
-    }));
+    if (context.taxonomy && context.termId || context.termData) {
+      return termDataFields;
+    }
+    return [];
   }
 };
 export {
-  term_data_default as default
+  term_data_default as default,
+  termDataFields
 };
 //# sourceMappingURL=term-data.js.map

package/build-module/bindings/term-data.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/bindings/term-data.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { store as coreDataStore } from '@wordpress/core-data';\nimport { store as blockEditorStore } from '@wordpress/block-editor';\n\n// Navigation block types that use special handling for backwards compatibility\nconst NAVIGATION_BLOCK_TYPES = [\n\t'core/navigation-link',\n\t'core/navigation-submenu',\n];\n\n/**\n * Creates the data fields object with the given term data values and ID value.\n *\n * @param {Object}        termDataValues The term data values.\n * @param {string|number} idValue        The ID value to use.\n * @return {Object} The data fields object.\n */\nfunction createDataFields( termDataValues, idValue ) {\n\treturn {\n\t\tid: {\n\t\t\tlabel: __( 'Term ID' ),\n\t\t\tvalue: idValue,\n\t\t\ttype: 'string',\n\t\t},\n\t\tname: {\n\t\t\tlabel: __( 'Name' ),\n\t\t\tvalue: termDataValues?.name,\n\t\t\ttype: 'string',\n\t\t},\n\t\tslug: {\n\t\t\tlabel: __( 'Slug' ),\n\t\t\tvalue: termDataValues?.slug,\n\t\t\ttype: 'string',\n\t\t},\n\t\tlink: {\n\t\t\tlabel: __( 'Link' ),\n\t\t\tvalue: termDataValues?.link,\n\t\t\ttype: 'string',\n\t\t},\n\t\tdescription: {\n\t\t\tlabel: __( 'Description' ),\n\t\t\tvalue: termDataValues?.description,\n\t\t\ttype: 'string',\n\t\t},\n\t\tparent: {\n\t\t\tlabel: __( 'Parent ID' ),\n\t\t\tvalue: termDataValues?.parent,\n\t\t\ttype: 'string',\n\t\t},\n\t\tcount: {\n\t\t\tlabel: __( 'Count' ),\n\t\t\tvalue: `(${ termDataValues?.count ?? 0 })`,\n\t\t\ttype: 'string',\n\t\t},\n\t};\n}\n\n/**\n * Gets a list of term data fields with their values and labels\n * to be consumed in the needed callbacks.\n * If the value is not available based on context, like in templates,\n * it falls back to the default value, label, or key.\n *\n * @param {Object} select   The select function from the data store.\n * @param {Object} context  The context provided.\n * @param {string} clientId The block client ID used to read attributes.\n * @return {Object} List of term data fields with their value and label.\n *\n * @example\n * ```js\n * {\n *     name: {\n *         label: 'Term Name',\n *         value: 'Category Name',\n *     },\n *     count: {\n *         label: 'Term Count',\n *         value: 5,\n *     },\n *     ...\n * }\n * ```\n */\nfunction getTermDataFields( select, context, clientId ) {\n\tconst { getEntityRecord } = select( coreDataStore );\n\tconst { getBlockAttributes, getBlockName } = select( blockEditorStore );\n\n\tlet termDataValues, dataFields;\n\n\t/*\n\t * BACKWARDS COMPATIBILITY: Hardcoded exception for navigation blocks.\n\t * Required for WordPress 6.9+ navigation blocks. DO NOT REMOVE.\n\t */\n\tconst blockName = getBlockName?.( clientId );\n\tconst isNavigationBlock = NAVIGATION_BLOCK_TYPES.includes( blockName );\n\n\tlet termId, taxonomy;\n\n\tif ( isNavigationBlock ) {\n\t\t// Navigation blocks: read from block attributes\n\t\tconst blockAttributes = getBlockAttributes?.( clientId );\n\t\ttermId = blockAttributes?.id;\n\t\tconst typeFromAttributes = blockAttributes?.type;\n\t\ttaxonomy =\n\t\t\ttypeFromAttributes === 'tag' ? 'post_tag' : typeFromAttributes;\n\t} else {\n\t\t// All other blocks: use context\n\t\ttermId = context?.termId;\n\t\ttaxonomy = context?.taxonomy;\n\t}\n\n\tif ( taxonomy && termId ) {\n\t\ttermDataValues = getEntityRecord( 'taxonomy', taxonomy, termId );\n\n\t\tif ( ! termDataValues && context?.termData ) {\n\t\t\ttermDataValues = context.termData;\n\t\t}\n\n\t\tif ( termDataValues ) {\n\t\t\tdataFields = createDataFields( termDataValues, termId );\n\t\t}\n\t} else if ( context?.termData ) {\n\t\ttermDataValues = context.termData;\n\t\tdataFields = createDataFields(\n\t\t\ttermDataValues,\n\t\t\ttermDataValues?.term_id\n\t\t);\n\t}\n\n\tif ( ! dataFields || ! Object.keys( dataFields ).length ) {\n\t\treturn null;\n\t}\n\n\treturn dataFields;\n}\n\n/**\n * @type {WPBlockBindingsSource}\n */\nexport default {\n\tname: 'core/term-data',\n\tusesContext: [ 'taxonomy', 'termId', 'termData' ],\n\tgetValues( { select, context, bindings, clientId } ) {\n\t\tconst dataFields = getTermDataFields( select, context, clientId );\n\n\t\tconst newValues = {};\n\t\tfor ( const [ attributeName, source ] of Object.entries( bindings ) ) {\n\t\t\t// Use the value, the field label, or the field key.\n\t\t\tconst fieldKey = source.args.field;\n\t\t\tconst { value: fieldValue, label: fieldLabel } =\n\t\t\t\tdataFields?.[ fieldKey ] || {};\n\t\t\tnewValues[ attributeName ] = fieldValue ?? fieldLabel ?? fieldKey;\n\t\t}\n\t\treturn newValues;\n\t},\n\t// eslint-disable-next-line no-unused-vars\n\tsetValues( { dispatch, context, bindings } ) {\n\t\t// Terms are typically not editable through block bindings in most contexts.\n\t\treturn false;\n\t},\n\tcanUserEditValue( { select, context, args } ) {\n\t\tconst { getBlockName, getSelectedBlockClientId } =\n\t\t\tselect( blockEditorStore );\n\n\t\tconst clientId = getSelectedBlockClientId();\n\t\tconst blockName = getBlockName?.( clientId );\n\n\t\t// Navigaton block types are read-only.\n\t\t// See https://github.com/WordPress/gutenberg/pull/72165.\n\t\tif ( NAVIGATION_BLOCK_TYPES.includes( blockName ) ) {\n\t\t\treturn false;\n\t\t}\n\n\t\t// Terms are typically read-only when displayed.\n\t\tif ( context?.termQuery ) {\n\t\t\treturn false;\n\t\t}\n\n\t\t// Lock editing when `taxonomy` or `termId` is not defined.\n\t\tif ( ! context?.taxonomy || ! context?.termId ) {\n\t\t\treturn false;\n\t\t}\n\n\t\tconst fieldValue = getTermDataFields( select, context, undefined )?.[\n\t\t\targs.field\n\t\t]?.value;\n\t\t// Empty string or `false` could be a valid value, so we need to check if the field value is undefined.\n\t\tif ( fieldValue === undefined ) {\n\t\t\treturn false;\n\t\t}\n\n\t\treturn false;\n\t},\n\tgetFieldsList( { select, context } ) {\n\t\tconst clientId = select( blockEditorStore ).getSelectedBlockClientId();\n\t\tconst termDataFields = getTermDataFields( select, context, clientId );\n\t\tif ( ! termDataFields ) {\n\t\t\treturn [];\n\t\t}\n\t\treturn Object.entries( termDataFields ).map( ( [ key, field ] ) => ( {\n\t\t\tlabel: field.label,\n\t\t\ttype: field.type,\n\t\t\targs: { field: key },\n\t\t} ) );\n\t},\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { store as coreDataStore } from '@wordpress/core-data';\nimport { store as blockEditorStore } from '@wordpress/block-editor';\n\n// Navigation block types that use special handling for backwards compatibility\nconst NAVIGATION_BLOCK_TYPES = [\n\t'core/navigation-link',\n\t'core/navigation-submenu',\n];\n\nexport const termDataFields = [\n\t{\n\t\tlabel: __( 'Term ID' ),\n\t\targs: { field: 'id' },\n\t\ttype: 'string',\n\t},\n\t{\n\t\tlabel: __( 'Name' ),\n\t\targs: { field: 'name' },\n\t\ttype: 'string',\n\t},\n\t{\n\t\tlabel: __( 'Slug' ),\n\t\targs: { field: 'slug' },\n\t\ttype: 'string',\n\t},\n\t{\n\t\tlabel: __( 'Link' ),\n\t\targs: { field: 'link' },\n\t\ttype: 'string',\n\t},\n\t{\n\t\tlabel: __( 'Description' ),\n\t\targs: { field: 'description' },\n\t\ttype: 'string',\n\t},\n\t{\n\t\tlabel: __( 'Parent ID' ),\n\t\targs: { field: 'parent' },\n\t\ttype: 'string',\n\t},\n\t{\n\t\tlabel: __( 'Count' ),\n\t\targs: { field: 'count' },\n\t\ttype: 'string',\n\t},\n];\n\n/**\n * @type {WPBlockBindingsSource}\n */\nexport default {\n\tname: 'core/term-data',\n\tusesContext: [ 'taxonomy', 'termId', 'termData' ],\n\tgetValues( { select, context, bindings, clientId } ) {\n\t\tconst { getEntityRecord } = select( coreDataStore );\n\n\t\t/*\n\t\t * BACKWARDS COMPATIBILITY: Hardcoded exception for navigation blocks.\n\t\t * Required for WordPress 6.9+ navigation blocks. DO NOT REMOVE.\n\t\t */\n\t\tconst { getBlockAttributes, getBlockName } = select( blockEditorStore );\n\t\tconst blockName = getBlockName( clientId );\n\t\tconst isNavigationBlock = NAVIGATION_BLOCK_TYPES.includes( blockName );\n\n\t\tlet termDataValues;\n\n\t\tif ( isNavigationBlock ) {\n\t\t\t// Navigation blocks: read from block attributes\n\t\t\tconst blockAttributes = getBlockAttributes( clientId );\n\t\t\tconst typeFromAttributes = blockAttributes?.type;\n\t\t\tconst taxonomy =\n\t\t\t\ttypeFromAttributes === 'tag' ? 'post_tag' : typeFromAttributes;\n\t\t\ttermDataValues = getEntityRecord(\n\t\t\t\t'taxonomy',\n\t\t\t\ttaxonomy,\n\t\t\t\tblockAttributes?.id\n\t\t\t);\n\t\t} else if ( context.termId && context.taxonomy ) {\n\t\t\t// All other blocks: use context\n\t\t\ttermDataValues = getEntityRecord(\n\t\t\t\t'taxonomy',\n\t\t\t\tcontext.taxonomy,\n\t\t\t\tcontext.termId\n\t\t\t);\n\t\t}\n\n\t\t// Fall back to context termData if available.\n\t\tif ( ! termDataValues && context?.termData && ! isNavigationBlock ) {\n\t\t\ttermDataValues = context.termData;\n\t\t}\n\n\t\tconst newValues = {};\n\t\tfor ( const [ attributeName, binding ] of Object.entries( bindings ) ) {\n\t\t\tconst termDataField = termDataFields.find(\n\t\t\t\t( field ) => field.args.field === binding.args.field\n\t\t\t);\n\n\t\t\tif ( ! termDataField ) {\n\t\t\t\t// If the field is unknown, return the field name.\n\t\t\t\tnewValues[ attributeName ] = binding.args.field;\n\t\t\t} else if (\n\t\t\t\t! termDataValues ||\n\t\t\t\ttermDataValues[ binding.args.field ] === undefined\n\t\t\t) {\n\t\t\t\t// If the term data does not exist, return the field label.\n\t\t\t\tnewValues[ attributeName ] = termDataField.label;\n\t\t\t} else if ( binding.args.field === 'count' ) {\n\t\t\t\t// Return the term count value in parentheses.\n\t\t\t\tnewValues[ attributeName ] =\n\t\t\t\t\t'(' + termDataValues[ binding.args.field ] + ')';\n\t\t\t} else {\n\t\t\t\t// If the term data exists, return the term data value.\n\t\t\t\tnewValues[ attributeName ] =\n\t\t\t\t\ttermDataValues[ binding.args.field ];\n\t\t\t}\n\t\t}\n\t\treturn newValues;\n\t},\n\t// eslint-disable-next-line no-unused-vars\n\tsetValues( { dispatch, context, bindings } ) {\n\t\t// Terms are typically not editable through block bindings in most contexts.\n\t\treturn false;\n\t},\n\tcanUserEditValue( { select, context } ) {\n\t\tconst { getBlockName, getSelectedBlockClientId } =\n\t\t\tselect( blockEditorStore );\n\n\t\tconst clientId = getSelectedBlockClientId();\n\t\tconst blockName = getBlockName( clientId );\n\n\t\t// Navigaton block types are read-only.\n\t\t// See https://github.com/WordPress/gutenberg/pull/72165.\n\t\tif ( NAVIGATION_BLOCK_TYPES.includes( blockName ) ) {\n\t\t\treturn false;\n\t\t}\n\n\t\t// Terms are typically read-only when displayed.\n\t\tif ( context?.termQuery ) {\n\t\t\treturn false;\n\t\t}\n\n\t\t// Lock editing when `taxonomy` or `termId` is not defined.\n\t\tif ( ! context?.taxonomy || ! context?.termId ) {\n\t\t\treturn false;\n\t\t}\n\n\t\treturn false;\n\t},\n\tgetFieldsList( { context, select } ) {\n\t\tconst { getBlockAttributes, getBlockName, getSelectedBlockClientId } =\n\t\t\tselect( blockEditorStore );\n\t\tconst clientId = getSelectedBlockClientId();\n\t\tconst blockName = getBlockName( clientId );\n\n\t\tif ( NAVIGATION_BLOCK_TYPES.includes( blockName ) ) {\n\t\t\t// Navigation blocks: read from block attributes\n\t\t\tconst blockAttributes = getBlockAttributes( clientId );\n\t\t\tif (\n\t\t\t\t! blockAttributes ||\n\t\t\t\t! blockAttributes.id ||\n\t\t\t\t! blockAttributes.type\n\t\t\t) {\n\t\t\t\treturn [];\n\t\t\t}\n\t\t\treturn termDataFields;\n\t\t}\n\n\t\tif ( ! context ) {\n\t\t\treturn [];\n\t\t}\n\n\t\tif ( ( context.taxonomy && context.termId ) || context.termData ) {\n\t\t\treturn termDataFields;\n\t\t}\n\n\t\treturn [];\n\t},\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/build-module/components/collab-sidebar/comments.js

@@ -56,17 +56,24 @@ function Comments({
   const { selectBlock, toggleBlockSpotlight } = unlock(
     useDispatch(blockEditorStore)
   );
-  const { blockCommentId, selectedBlockClientId, orderedBlockIds } = useSelect((select) => {
+  const {
+    blockCommentId,
+    selectedBlockClientId,
+    orderedBlockIds,
+    blockMode
+  } = useSelect((select) => {
     const {
       getBlockAttributes,
       getSelectedBlockClientId,
-      getClientIdsWithDescendants
+      getClientIdsWithDescendants,
+      getBlockMode
     } = select(blockEditorStore);
     const clientId = getSelectedBlockClientId();
     return {
       blockCommentId: clientId ? getBlockAttributes(clientId)?.metadata?.noteId : null,
       selectedBlockClientId: clientId,
-      orderedBlockIds: getClientIdsWithDescendants()
+      orderedBlockIds: getClientIdsWithDescendants(),
+      blockMode: clientId ? getBlockMode(clientId) : null
     };
   }, []);
   const relatedBlockElement = useBlockElement(selectedBlockClientId);
@@ -219,7 +226,8 @@ function Comments({
     isFloating,
     threads,
     selectedThread,
-    setCanvasMinHeight
+    setCanvasMinHeight,
+    blockMode
   ]);
   const handleThreadNavigation = (event, thread, isSelected) => {
     if (event.defaultPrevented) {
@@ -341,18 +349,40 @@ function Thread({
     selectedThread,
     commentLastUpdated
   });
+  const isKeyboardTabbingRef = useRef(false);
   const onMouseEnter = () => {
     debouncedToggleBlockHighlight(thread.blockClientId, true);
   };
   const onMouseLeave = () => {
     debouncedToggleBlockHighlight(thread.blockClientId, false);
   };
+  const onFocus = () => {
+    toggleBlockHighlight(thread.blockClientId, true);
+  };
+  const onBlur = (event) => {
+    const isNoteFocused = event.relatedTarget?.closest(
+      ".editor-collab-sidebar-panel__thread"
+    );
+    const isDialogFocused = event.relatedTarget?.closest('[role="dialog"]');
+    const isTabbing = isKeyboardTabbingRef.current;
+    if (isNoteFocused && !isTabbing) {
+      return;
+    }
+    if (isDialogFocused) {
+      return;
+    }
+    if (isTabbing && event.currentTarget.contains(event.relatedTarget)) {
+      return;
+    }
+    toggleBlockHighlight(thread.blockClientId, false);
+    unselectThread();
+  };
   const handleCommentSelect = () => {
     setNewNoteFormState("closed");
     setSelectedThread(thread.id);
+    toggleBlockSpotlight(thread.blockClientId, true);
     if (!!thread.blockClientId) {
       selectBlock(thread.blockClientId, null);
-      toggleBlockSpotlight(thread.blockClientId, true);
     }
   };
   const unselectThread = () => {
@@ -403,9 +433,20 @@ function Thread({
       onClick: handleCommentSelect,
       onMouseEnter,
       onMouseLeave,
-      onFocus: onMouseEnter,
-      onBlur: onMouseLeave,
-      onKeyDown,
+      onFocus,
+      onBlur,
+      onKeyUp: (event) => {
+        if (event.key === "Tab") {
+          isKeyboardTabbingRef.current = false;
+        }
+      },
+      onKeyDown: (event) => {
+        if (event.key === "Tab") {
+          isKeyboardTabbingRef.current = true;
+        } else {
+          onKeyDown(event);
+        }
+      },
       tabIndex: 0,
       role: "treeitem",
       "aria-label": ariaLabel,
@@ -607,6 +648,12 @@ var CommentBoard = ({
   ];
   const canResolve = thread.parent === 0;
   const moreActions = parent?.status !== "approved" ? actions.filter((item) => item.isEligible(thread)) : [];
+  const deleteConfirmMessage = (
+    // When deleting a top level note, descendants will also be deleted.
+    thread.parent === 0 ? __(
+      "Are you sure you want to delete this note? This will also delete all of this note's replies."
+    ) : __("Are you sure you want to delete this reply?")
+  );
   return /* @__PURE__ */ jsxs(
     VStack,
     {
@@ -667,14 +714,20 @@ var CommentBoard = ({
                       )
                     }
                   ),
-                  /* @__PURE__ */ jsx(Menu.Popover, { children: moreActions.map((action) => /* @__PURE__ */ jsx(
-                    Menu.Item,
+                  /* @__PURE__ */ jsx(
+                    Menu.Popover,
                     {
-                      onClick: () => action.onClick(),
-                      children: /* @__PURE__ */ jsx(Menu.ItemLabel, { children: action.title })
-                    },
-                    action.id
-                  )) })
+                      modal: false,
+                      children: moreActions.map((action) => /* @__PURE__ */ jsx(
+                        Menu.Item,
+                        {
+                          onClick: () => action.onClick(),
+                          children: /* @__PURE__ */ jsx(Menu.ItemLabel, { children: action.title })
+                        },
+                        action.id
+                      ))
+                    }
+                  )
                 ] })
               ] })
             }
@@ -733,9 +786,7 @@ var CommentBoard = ({
             onConfirm: handleConfirmDelete,
             onCancel: handleCancel,
             confirmButtonText: __("Delete"),
-            children: __(
-              "Are you sure you want to delete this note? This will also delete all of this note's replies."
-            )
+            children: deleteConfirmMessage
           }
         )
       ]