Merge branch 'main' into react/ref-init-impure-purity

Author: angular-bootstrap

compiler/yarn.lock

@@ -10525,7 +10525,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10598,7 +10607,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11064,9 +11080,9 @@ undici-types@~6.19.2:
   integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
 
 undici@^6.19.5:
-  version "6.21.2"
-  resolved "https://registry.npmjs.org/undici/-/undici-6.21.2.tgz"
-  integrity sha512-uROZWze0R0itiAKVPsYhFov9LxrPMHLMEQFszeI2gCN6bnIIZ8twzBCJcN2LJrBBLfrP0t1FW0g+JmKVl8Vk1g==
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-6.23.0.tgz#7953087744d9095a96f115de3140ca3828aff3a4"
+  integrity sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.1"
@@ -11375,7 +11391,7 @@ workerpool@^6.5.1:
   resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz"
   integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11393,6 +11409,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"

fixtures/packaging/webpack-alias/dev/yarn.lock

@@ -936,8 +936,8 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.1.tgz#2bad97710a5b661c366b378b1e3a44a592ff45e6"
 
 querystring-es3@^0.2.0:
   version "0.2.1"

fixtures/packaging/webpack/prod/yarn.lock

@@ -936,8 +936,8 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.1.tgz#2bad97710a5b661c366b378b1e3a44a592ff45e6"
 
 querystring-es3@^0.2.0:
   version "0.2.1"

packages/react-client/src/ReactFlightClient.js

@@ -1040,6 +1040,8 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
     // Initialize any debug info and block the initializing chunk on any
     // unresolved entries.
     initializeDebugChunk(response, chunk);
+    // TODO: The chunk might have transitioned to ERRORED now.
+    // Should we return early if that happens?
   }
 
   try {
@@ -1075,6 +1077,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
     const initializedChunk: InitializedChunk<T> = (chunk: any);
     initializedChunk.status = INITIALIZED;
     initializedChunk.value = value;
+    initializedChunk.reason = null;
 
     if (__DEV__) {
       processChunkDebugInfo(response, initializedChunk, value);
@@ -1097,6 +1100,7 @@ function initializeModuleChunk<T>(chunk: ResolvedModuleChunk<T>): void {
     const initializedChunk: InitializedChunk<T> = (chunk: any);
     initializedChunk.status = INITIALIZED;
     initializedChunk.value = value;
+    initializedChunk.reason = null;
   } catch (error) {
     const erroredChunk: ErroredChunk<T> = (chunk: any);
     erroredChunk.status = ERRORED;

packages/react-devtools-shared/src/devtools/views/Components/InspectedElementSuspendedBy.js

@@ -584,6 +584,9 @@ export default function InspectedElementSuspendedBy({
       break;
   }
 
+  if (groups.length === 0) {
+    return null;
+  }
   return (
     <div>
       <div className={styles.HeaderRow}>

packages/react-dom-bindings/src/client/CSSShorthandProperty.js

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// List derived from Gecko source code:
-// https://github.com/mozilla/gecko-dev/blob/4e638efc71/layout/style/test/property_database.js
+// List derived from Firefox source code:
+// https://github.com/mozilla-firefox/firefox/blob/58f365ba0eb5761a182f1925e4654cc75212b8ac/layout/style/test/property_database.js
 export const shorthandToLonghand = {
   animation: [
     'animationDelay',
@@ -49,6 +49,15 @@ export const shorthandToLonghand = {
     'borderTopStyle',
     'borderTopWidth',
   ],
+  borderBlock: [
+    'borderBlockEndColor',
+    'borderBlockEndStyle',
+    'borderBlockEndWidth',
+    'borderBlockStartColor',
+    'borderBlockStartStyle',
+    'borderBlockStartWidth',
+  ],
+  borderBlockColor: ['borderBlockEndColor', 'borderBlockStartColor'],
   borderBlockEnd: [
     'borderBlockEndColor',
     'borderBlockEndStyle',
@@ -59,6 +68,8 @@ export const shorthandToLonghand = {
     'borderBlockStartStyle',
     'borderBlockStartWidth',
   ],
+  borderBlockStyle: ['borderBlockEndStyle', 'borderBlockStartStyle'],
+  borderBlockWidth: ['borderBlockEndWidth', 'borderBlockStartWidth'],
   borderBottom: ['borderBottomColor', 'borderBottomStyle', 'borderBottomWidth'],
   borderColor: [
     'borderBottomColor',
@@ -73,6 +84,15 @@ export const shorthandToLonghand = {
     'borderImageSource',
     'borderImageWidth',
   ],
+  borderInline: [
+    'borderInlineEndColor',
+    'borderInlineEndStyle',
+    'borderInlineEndWidth',
+    'borderInlineStartColor',
+    'borderInlineStartStyle',
+    'borderInlineStartWidth',
+  ],
+  borderInlineColor: ['borderInlineEndColor', 'borderInlineStartColor'],
   borderInlineEnd: [
     'borderInlineEndColor',
     'borderInlineEndStyle',
@@ -83,6 +103,8 @@ export const shorthandToLonghand = {
     'borderInlineStartStyle',
     'borderInlineStartWidth',
   ],
+  borderInlineStyle: ['borderInlineEndStyle', 'borderInlineStartStyle'],
+  borderInlineWidth: ['borderInlineEndWidth', 'borderInlineStartWidth'],
   borderLeft: ['borderLeftColor', 'borderLeftStyle', 'borderLeftWidth'],
   borderRadius: [
     'borderBottomLeftRadius',
@@ -104,8 +126,11 @@ export const shorthandToLonghand = {
     'borderRightWidth',
     'borderTopWidth',
   ],
+  colorAdjust: ['printColorAdjust'],
   columnRule: ['columnRuleColor', 'columnRuleStyle', 'columnRuleWidth'],
   columns: ['columnCount', 'columnWidth'],
+  containIntrinsicSize: ['containIntrinsicHeight', 'containIntrinsicWidth'],
+  container: ['containerName', 'containerType'],
   flex: ['flexBasis', 'flexGrow', 'flexShrink'],
   flexFlow: ['flexDirection', 'flexWrap'],
   font: [
@@ -127,6 +152,12 @@ export const shorthandToLonghand = {
     'fontWeight',
     'lineHeight',
   ],
+  fontSynthesis: [
+    'fontSynthesisPosition',
+    'fontSynthesisSmallCaps',
+    'fontSynthesisStyle',
+    'fontSynthesisWeight',
+  ],
   fontVariant: [
     'fontVariantAlternates',
     'fontVariantCaps',
@@ -155,8 +186,13 @@ export const shorthandToLonghand = {
     'gridTemplateColumns',
     'gridTemplateRows',
   ],
+  inset: ['bottom', 'left', 'right', 'top'],
+  insetBlock: ['insetBlockEnd', 'insetBlockStart'],
+  insetInline: ['insetInlineEnd', 'insetInlineStart'],
   listStyle: ['listStyleImage', 'listStylePosition', 'listStyleType'],
   margin: ['marginBottom', 'marginLeft', 'marginRight', 'marginTop'],
+  marginBlock: ['marginBlockEnd', 'marginBlockStart'],
+  marginInline: ['marginInlineEnd', 'marginInlineStart'],
   marker: ['markerEnd', 'markerMid', 'markerStart'],
   mask: [
     'maskClip',
@@ -170,23 +206,57 @@ export const shorthandToLonghand = {
     'maskSize',
   ],
   maskPosition: ['maskPositionX', 'maskPositionY'],
+  offset: [
+    'offsetAnchor',
+    'offsetDistance',
+    'offsetPath',
+    'offsetPosition',
+    'offsetRotate',
+  ],
   outline: ['outlineColor', 'outlineStyle', 'outlineWidth'],
   overflow: ['overflowX', 'overflowY'],
+  overscrollBehavior: ['overscrollBehaviorX', 'overscrollBehaviorY'],
   padding: ['paddingBottom', 'paddingLeft', 'paddingRight', 'paddingTop'],
+  paddingBlock: ['paddingBlockEnd', 'paddingBlockStart'],
+  paddingInline: ['paddingInlineEnd', 'paddingInlineStart'],
+  pageBreakAfter: ['breakAfter'],
+  pageBreakBefore: ['breakBefore'],
+  pageBreakInside: ['breakInside'],
   placeContent: ['alignContent', 'justifyContent'],
   placeItems: ['alignItems', 'justifyItems'],
   placeSelf: ['alignSelf', 'justifySelf'],
+  scrollMargin: [
+    'scrollMarginBottom',
+    'scrollMarginLeft',
+    'scrollMarginRight',
+    'scrollMarginTop',
+  ],
+  scrollMarginBlock: ['scrollMarginBlockEnd', 'scrollMarginBlockStart'],
+  scrollMarginInline: ['scrollMarginInlineEnd', 'scrollMarginInlineStart'],
+  scrollPadding: [
+    'scrollPaddingBottom',
+    'scrollPaddingLeft',
+    'scrollPaddingRight',
+    'scrollPaddingTop',
+  ],
+  scrollPaddingBlock: ['scrollPaddingBlockEnd', 'scrollPaddingBlockStart'],
+  scrollPaddingInline: ['scrollPaddingInlineEnd', 'scrollPaddingInlineStart'],
   textDecoration: [
     'textDecorationColor',
     'textDecorationLine',
     'textDecorationStyle',
+    'textDecorationThickness',
   ],
   textEmphasis: ['textEmphasisColor', 'textEmphasisStyle'],
+  textWrap: ['textWrapMode', 'textWrapStyle'],
   transition: [
+    'transitionBehavior',
     'transitionDelay',
     'transitionDuration',
     'transitionProperty',
     'transitionTimingFunction',
   ],
+  verticalAlign: ['alignmentBaseline', 'baselineShift', 'baselineSource'],
+  whiteSpace: ['textWrapMode', 'whiteSpaceCollapse'],
   wordWrap: ['overflowWrap'],
 };

packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js

@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
   //
   // We could compare the node to document.activeElement after focus,
   // but this would not handle the case where application code managed focus to automatically blur.
+  const element = ((node: any): HTMLElement);
+
+  // If this element is already the active element, it's focusable and already
+  // focused. Calling .focus() on it would be a no-op (no focus event fires),
+  // so we short-circuit here.
+  if (element.ownerDocument.activeElement === element) {
+    return true;
+  }
+
   let didFocus = false;
   const handleFocus = () => {
     didFocus = true;
   };
 
-  const element = ((node: any): HTMLElement);
   try {
-    element.addEventListener('focus', handleFocus);
+    // Listen on the document in the capture phase so we detect focus even when
+    // it lands on a different element than the one we called .focus() on. This
+    // happens with <label> elements (focus delegates to the associated input)
+    // and shadow hosts with delegatesFocus.
+    element.ownerDocument.addEventListener('focus', handleFocus, true);
     // $FlowFixMe[method-unbinding]
     (element.focus || HTMLElement.prototype.focus).call(element, focusOptions);
   } finally {
-    element.removeEventListener('focus', handleFocus);
+    element.ownerDocument.removeEventListener('focus', handleFocus, true);
   }
 
   return didFocus;