Merge branch 'main' into @mbert/move-changes-from-next-to-main

Author: m-bert

.github/workflows/check-archs-consistency.yml

@@ -5,7 +5,8 @@ on:
       - main
     paths: 
       - src/specs/**
-      - android/paper/**
+      - package.json
+      - FabricExample/package.json
       - .github/workflows/check-archs-consistency.yml
   push:
     branches:

android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java

@@ -12,10 +12,11 @@
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNGestureHandlerButtonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerButtonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNGestureHandlerButtonManagerDelegate(U viewManager) {
     super(viewManager);
   }

android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java

@@ -11,10 +11,11 @@
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNGestureHandlerRootViewManagerDelegate(U viewManager) {
     super(viewManager);
   }

docs/src/theme/AnnouncementBar/Content/index.js

@@ -3,21 +3,21 @@ import clsx from 'clsx';
 import ArrowButton from './ArrowButton';
 import styles from './styles.module.css';
 import useBaseUrl from '@docusaurus/useBaseUrl';
+import AnnouncementBarCloseButton from '@theme/AnnouncementBar/CloseButton';
 
 export default function AnnouncementBarContent(props) {
+  const { isCloseable, close } = props;
   return (
     <div className={clsx(styles.content, props.className)}>
-      <div className={styles.wrapper}>
-        <img
-          className={styles.logo}
-          src={useBaseUrl('/img/state-of-react-native-logo.svg')}
-          alt="State of React Native logo"
-        />
-        <strong className={styles.headline}>State of React Native 2024</strong>
-        <p className={styles.subText}>
-          Have a few minutes and want to shape the future of React Native?
-        </p>
-      </div>
+      <img
+        className={styles.logo}
+        src={useBaseUrl('/img/state-of-react-native-logo.svg')}
+        alt="State of React Native logo"
+      />
+      <strong className={styles.headline}>State of React Native 2024</strong>
+      <p className={styles.subText}>
+        Have a few minutes and want to shape the future of React Native?
+      </p>
       <a
         className={styles.link}
         href="https://survey.stateofreactnative.com/"
@@ -28,6 +28,9 @@ export default function AnnouncementBarContent(props) {
           <ArrowButton className={styles.linkArrow} />
         </div>
       </a>
+      {isCloseable && (
+        <AnnouncementBarCloseButton onClick={close} className={styles.close} />
+      )}
     </div>
   );
 }

docs/src/theme/AnnouncementBar/Content/styles.module.css

@@ -1,8 +1,11 @@
 .content {
-  display: flex;
+  display: grid;
+  grid-template-columns: auto auto auto 1fr auto;
+  grid-template-areas: 'logo headline subText link close';
   align-items: center;
-  justify-content: space-between;
+  gap: 8px;
   margin: 0 auto;
+  width: 100%;
   max-width: 1440px;
 
   padding: 8px 16px;
@@ -11,26 +14,17 @@
 .logo {
   height: 36px;
   width: 36px;
-  margin: auto;
   grid-area: logo;
 }
 
 .content a {
   color: inherit;
 }
 
-.wrapper {
-  display: flex;
-  flex-direction: row;
-  gap: 8px;
-  align-items: center;
-  justify-content: center;
-}
-
 .headline {
   font-size: 16px;
-  grid-area: headline;
   text-wrap: nowrap;
+  grid-area: headline;
 }
 
 p.subText {
@@ -48,12 +42,18 @@ a.link {
   display: flex;
   flex-direction: row;
   align-items: center;
+  justify-content: center;
   gap: 6px;
   font-size: 14px;
   padding: 4px 12px;
   border: 1px solid var(--swm-navy-light-100);
   background-color: var(--swm-navy-light-100);
-  transition: all 0.2s ease-in-out;
+  transition:
+    border 0.2s ease-in-out,
+    background-color 0.2s ease-in-out;
+  grid-area: link;
+  margin-left: auto;
+  margin-right: 64px;
 }
 
 .linkTitle {
@@ -86,32 +86,44 @@ a.link {
   align-items: center;
 }
 
-@media screen and (max-width: 996px) {
+.close {
+  opacity: 1;
+  grid-area: close;
+}
+
+.close svg g {
+  stroke: var(--swm-navy-light-100);
+  stroke-width: 2;
+}
+
+@media screen and (max-width: 1200px) {
   .content {
-    gap: 12px;
-  }
-  .wrapper {
-    display: grid;
-    grid-template-columns: 50px 1fr;
+    grid-template-columns: auto 1fr 1fr auto;
     grid-template-areas:
-      'logo headline'
-      'logo subText';
-    gap: 0;
-    align-items: center;
+      'logo headline link close'
+      'logo subText link close';
+  }
+  .link {
+    margin: auto;
   }
 }
 
-@media screen and (max-width: 768px) {
+@media screen and (max-width: 600px) {
   .content {
-    flex-direction: column;
-    align-items: flex-start;
-    padding: 8px 16px;
+    grid-template-columns: auto 1fr auto;
+    grid-template-areas:
+      'logo headline close'
+      'logo subText  close'
+      'link link link';
   }
-}
-
-@media screen and (max-width: 450px) {
   .link {
-    width: 100%;
-    justify-content: center;
+    margin: 0;
+  }
+  .logo {
+    margin-bottom: auto;
+  }
+  .close {
+    padding: 8px !important;
+    margin-bottom: auto;
   }
 }

docs/src/theme/AnnouncementBar/index.js

@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useThemeConfig } from '@docusaurus/theme-common';
 import { useAnnouncementBar } from '@docusaurus/theme-common/internal';
-import AnnouncementBarCloseButton from '@theme/AnnouncementBar/CloseButton';
 import AnnouncementBarContent from '@theme/AnnouncementBar/Content';
 import BrowserOnly from '@docusaurus/BrowserOnly';
 import styles from './styles.module.css';
@@ -48,16 +47,11 @@ function AnnouncementBar() {
           className={styles.announcementBar}
           style={{ backgroundColor, color: textColor }}
           role="banner">
-          {isCloseable && <div className={styles.announcementBarPlaceholder} />}
-          <AnnouncementBarContent className={styles.announcementBarContent} />
-          {isCloseable && (
-            <div className={styles.buttonContainer}>
-              <AnnouncementBarCloseButton
-                onClick={close}
-                className={styles.announcementBarClose}
-              />
-            </div>
-          )}
+          <AnnouncementBarContent
+            className={styles.announcementBarContent}
+            isCloseable={isCloseable}
+            close={close}
+          />
         </div>
       )}
     </BrowserOnly>

docs/src/theme/AnnouncementBar/styles.module.css

@@ -13,73 +13,8 @@
   z-index: 10;
 }
 
-.announcementBarAdornment {
-  height: 500px;
-  width: 500px;
-  position: absolute;
-  opacity: 0.3;
-  pointer-events: none;
-}
-
-.announcementBarPlaceholder {
-  flex: 0 0 30px;
-  margin: 0 25px;
-}
-
-.announcementBarClose {
-  flex: 0 0 30px;
-  margin: 0 25px;
-  align-self: stretch;
-  opacity: 1;
-}
-
-.announcementBarClose svg g {
-  stroke: var(--swm-navy-light-100);
-  stroke-width: 2;
-}
-
-.announcementBarContent {
-  flex: 1 1 auto;
-}
-
-.buttonContainer {
-  display: flex;
-  justify-content: center;
-  padding-right: 1rem;
-}
-
 @media print {
   .announcementBar {
     display: none;
   }
 }
-
-@media screen and (max-width: 996px) {
-  .announcementBarClose {
-    margin: 0;
-  }
-  .announcementBarPlaceholder {
-    display: none;
-  }
-}
-@media screen and (max-width: 768px) {
-  .buttonContainer {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    padding-top: 1rem;
-  }
-}
-@media screen and (max-width: 600px) {
-  .announcementBarRightAdornment {
-    display: none;
-  }
-}
-
-@media screen and (max-width: 450px) {
-  .buttonContainer {
-    padding-top: 0;
-    align-items: center;
-    justify-content: center;
-  }
-}

package.json

@@ -69,10 +69,10 @@
     "invariant": "^2.2.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.9",
-    "@babel/preset-env": "^7.12.11",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.12.7",
-    "@react-native/babel-preset": "^0.74.85",
+    "@react-native/babel-preset": "0.77.0-rc.3",
     "@testing-library/react-native": "^12.5.1",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/invariant": "^2.2.37",
@@ -94,8 +94,8 @@
     "lint-staged": "^12.3.2",
     "madge": "^6.1.0",
     "prettier": "3.3.3",
-    "react": "18.2.0",
-    "react-native": "0.74.3",
+    "react": "18.3.1",
+    "react-native": "0.77.0-rc.3",
     "react-native-builder-bob": "^0.17.1",
     "react-native-reanimated": "^3.12.0",
     "react-test-renderer": "18.2.0",