@office-iss/react-native-win32 0.0.0-canary.265 → 0.0.0-canary.267

package/src/private/webapis/performance/specs/NativePerformanceObserver.js

@@ -14,6 +14,10 @@ import * as TurboModuleRegistry from '../../../../../Libraries/TurboModule/Turbo
 
 export type RawPerformanceEntryType = number;
 
+export type OpaqueNativeObserverHandle = mixed;
+
+export type NativeBatchedObserverCallback = () => void;
+
 export type RawPerformanceEntry = {|
   name: string,
   entryType: RawPerformanceEntryType,
@@ -25,26 +29,30 @@ export type RawPerformanceEntry = {|
   interactionId?: number,
 |};
 
-export type GetPendingEntriesResult = {|
-  entries: $ReadOnlyArray<RawPerformanceEntry>,
-  droppedEntriesCount: number,
-|};
+export type PerformanceObserverInit = {
+  entryTypes?: $ReadOnlyArray<number>,
+  type?: number,
+  buffered?: boolean,
+  durationThreshold?: number,
+};
 
 export interface Spec extends TurboModule {
-  +startReporting: (entryType: RawPerformanceEntryType) => void;
-  +stopReporting: (entryType: RawPerformanceEntryType) => void;
-  +setIsBuffered: (
-    entryTypes: $ReadOnlyArray<RawPerformanceEntryType>,
-    isBuffered: boolean,
-  ) => void;
-  +popPendingEntries: () => GetPendingEntriesResult;
-  +setOnPerformanceEntryCallback: (callback?: () => void) => void;
-  +logRawEntry: (entry: RawPerformanceEntry) => void;
   +getEventCounts: () => $ReadOnlyArray<[string, number]>;
-  +setDurationThreshold: (
-    entryType: RawPerformanceEntryType,
-    durationThreshold: number,
+  +createObserver?: (
+    callback: NativeBatchedObserverCallback,
+  ) => OpaqueNativeObserverHandle;
+  +getDroppedEntriesCount?: (observer: OpaqueNativeObserverHandle) => number;
+
+  +observe?: (
+    observer: OpaqueNativeObserverHandle,
+    options: PerformanceObserverInit,
   ) => void;
+  +disconnect?: (observer: OpaqueNativeObserverHandle) => void;
+  +takeRecords?: (
+    observer: OpaqueNativeObserverHandle,
+    sort: boolean,
+  ) => $ReadOnlyArray<RawPerformanceEntry>;
+
   +clearEntries: (
     entryType?: RawPerformanceEntryType,
     entryName?: string,

package/src/private/webapis/performance/specs/__mocks__/NativePerformance.js

@@ -11,23 +11,24 @@
 import type {
   NativeMemoryInfo,
   ReactNativeStartupTiming,
-  Spec as NativePerformance,
 } from '../NativePerformance';
 
 import {RawPerformanceEntryTypeValues} from '../../RawPerformanceEntry';
-import NativePerformanceObserver from '../NativePerformanceObserver';
+import NativePerformance from '../NativePerformance';
+import {logMockEntry} from './NativePerformanceObserver';
 
 const marks: Map<string, number> = new Map();
 
-const NativePerformanceMock: NativePerformance = {
+const NativePerformanceMock: typeof NativePerformance = {
   mark: (name: string, startTime: number): void => {
-    NativePerformanceObserver?.logRawEntry({
-      name,
+    NativePerformance?.mark(name, startTime);
+    marks.set(name, startTime);
+    logMockEntry({
       entryType: RawPerformanceEntryTypeValues.MARK,
+      name,
       startTime,
       duration: 0,
     });
-    marks.set(name, startTime);
   },
 
   measure: (
@@ -40,11 +41,12 @@ const NativePerformanceMock: NativePerformance = {
   ): void => {
     const start = startMark != null ? marks.get(startMark) ?? 0 : startTime;
     const end = endMark != null ? marks.get(endMark) ?? 0 : endTime;
-    NativePerformanceObserver?.logRawEntry({
-      name,
+    NativePerformance?.measure(name, start, end);
+    logMockEntry({
       entryType: RawPerformanceEntryTypeValues.MEASURE,
+      name,
       startTime: start,
-      duration: duration ?? (end ? end - start : 0),
+      duration: duration ?? end - start,
     });
   },
 

package/src/private/webapis/performance/specs/__mocks__/NativePerformanceObserver.js

@@ -9,90 +9,117 @@
  */
 
 import type {
-  GetPendingEntriesResult,
+  NativeBatchedObserverCallback,
   RawPerformanceEntry,
   RawPerformanceEntryType,
+  OpaqueNativeObserverHandle,
+  PerformanceObserverInit,
   Spec as NativePerformanceObserver,
 } from '../NativePerformanceObserver';
 
 import {RawPerformanceEntryTypeValues} from '../../RawPerformanceEntry';
 
-const reportingType: Set<RawPerformanceEntryType> = new Set();
-const isAlwaysLogged: Set<RawPerformanceEntryType> = new Set();
+jest.mock(
+  '../NativePerformance',
+  () => require('../__mocks__/NativePerformance').default,
+);
+
+jest.mock(
+  '../NativePerformanceObserver',
+  () => require('../__mocks__/NativePerformanceObserver').default,
+);
+
 const eventCounts: Map<string, number> = new Map();
-const durationThresholds: Map<RawPerformanceEntryType, number> = new Map();
+let observers: MockObserver[] = [];
 let entries: Array<RawPerformanceEntry> = [];
-let onPerformanceEntryCallback: ?() => void;
 
-const NativePerformanceObserverMock: NativePerformanceObserver = {
-  startReporting: (entryType: RawPerformanceEntryType) => {
-    reportingType.add(entryType);
-  },
+export function logMockEntry(entry: RawPerformanceEntry) {
+  entries.push(entry);
 
-  stopReporting: (entryType: RawPerformanceEntryType) => {
-    reportingType.delete(entryType);
-    durationThresholds.delete(entryType);
-  },
+  if (entry.entryType === RawPerformanceEntryTypeValues.EVENT) {
+    eventCounts.set(entry.name, (eventCounts.get(entry.name) ?? 0) + 1);
+  }
+
+  for (const observer of observers) {
+    if (
+      observer.options.type !== entry.entryType &&
+      !observer.options.entryTypes?.includes(entry.entryType)
+    ) {
+      continue;
+    }
 
-  setIsBuffered: (
-    entryTypes: $ReadOnlyArray<RawPerformanceEntryType>,
-    isBuffered: boolean,
-  ) => {
-    for (const entryType of entryTypes) {
-      if (isBuffered) {
-        isAlwaysLogged.add(entryType);
-      } else {
-        isAlwaysLogged.delete(entryType);
+    if (entry.entryType === RawPerformanceEntryTypeValues.EVENT) {
+      const {durationThreshold = 0} = observer.options;
+      if (durationThreshold > 0 && entry.duration < durationThreshold) {
+        continue;
       }
     }
+
+    observer.entries.push(entry);
+
+    // $FlowFixMe[incompatible-call]
+    global.queueMicrotask(() => {
+      // We want to emulate the way it's done in native (i.e. async/batched)
+      observer.callback();
+    });
+  }
+}
+
+type MockObserver = {
+  callback: NativeBatchedObserverCallback,
+  entries: Array<RawPerformanceEntry>,
+  options: PerformanceObserverInit,
+  droppedEntriesCount: number,
+};
+
+const NativePerformanceObserverMock: NativePerformanceObserver = {
+  getEventCounts: (): $ReadOnlyArray<[string, number]> => {
+    return Array.from(eventCounts.entries());
   },
 
-  popPendingEntries: (): GetPendingEntriesResult => {
-    const res = entries;
-    entries = [];
-    return {
+  createObserver: (
+    callback: NativeBatchedObserverCallback,
+  ): OpaqueNativeObserverHandle => {
+    const observer: MockObserver = {
+      callback,
+      entries: [],
+      options: {},
       droppedEntriesCount: 0,
-      entries: res,
     };
+
+    return observer;
   },
 
-  setOnPerformanceEntryCallback: (callback?: () => void) => {
-    onPerformanceEntryCallback = callback;
+  getDroppedEntriesCount: (observer: OpaqueNativeObserverHandle): number => {
+    // $FlowFixMe
+    const mockObserver = (observer: any) as MockObserver;
+    return mockObserver.droppedEntriesCount;
   },
 
-  logRawEntry: (entry: RawPerformanceEntry) => {
-    if (
-      reportingType.has(entry.entryType) ||
-      isAlwaysLogged.has(entry.entryType)
-    ) {
-      const durationThreshold = durationThresholds.get(entry.entryType);
-      if (
-        durationThreshold !== undefined &&
-        entry.duration < durationThreshold
-      ) {
-        return;
-      }
-      entries.push(entry);
-      // $FlowFixMe[incompatible-call]
-      global.queueMicrotask(() => {
-        // We want to emulate the way it's done in native (i.e. async/batched)
-        onPerformanceEntryCallback?.();
-      });
-    }
-    if (entry.entryType === RawPerformanceEntryTypeValues.EVENT) {
-      eventCounts.set(entry.name, (eventCounts.get(entry.name) ?? 0) + 1);
-    }
+  observe: (
+    observer: OpaqueNativeObserverHandle,
+    options: PerformanceObserverInit,
+  ): void => {
+    // $FlowFixMe
+    const mockObserver = (observer: any) as MockObserver;
+    mockObserver.options = options;
+    observers.push(mockObserver);
   },
 
-  getEventCounts: (): $ReadOnlyArray<[string, number]> => {
-    return Array.from(eventCounts.entries());
+  disconnect: (observer: OpaqueNativeObserverHandle): void => {
+    // $FlowFixMe
+    const mockObserver = (observer: any) as MockObserver;
+    observers = observers.filter(e => e !== mockObserver);
   },
 
-  setDurationThreshold: (
-    entryType: RawPerformanceEntryType,
-    durationThreshold: number,
-  ) => {
-    durationThresholds.set(entryType, durationThreshold);
+  takeRecords: (
+    observer: OpaqueNativeObserverHandle,
+  ): $ReadOnlyArray<RawPerformanceEntry> => {
+    // $FlowFixMe
+    const mockObserver = (observer: any) as MockObserver;
+    const observerEntries = mockObserver.entries;
+    mockObserver.entries = [];
+    return observerEntries;
   },
 
   clearEntries: (entryType?: RawPerformanceEntryType, entryName?: string) => {

package/types/experimental.d.ts

@@ -50,7 +50,7 @@ declare module '.' {
   }
 
   export interface ViewStyle {
-    experimental_mixBlendMode?: BlendMode | undefined;
+    mixBlendMode?: BlendMode | undefined;
     experimental_backgroundImage?:
       | ReadonlyArray<GradientValue>
       | string

package/types/index.d.ts

@@ -104,7 +104,6 @@ export * from '../Libraries/Components/View/ViewAccessibility';
 export * from '../Libraries/Components/View/ViewPropTypes';
 export * from '../Libraries/Components/Button';
 export * from '../Libraries/Core/registerCallableModule';
-export * from '../Libraries/DevToolsSettings/DevToolsSettingsManager';
 export * from '../Libraries/EventEmitter/NativeEventEmitter';
 export * from '../Libraries/EventEmitter/RCTDeviceEventEmitter';
 export * from '../Libraries/EventEmitter/RCTNativeAppEventEmitter';
@@ -142,6 +141,7 @@ export * as TurboModuleRegistry from '../Libraries/TurboModule/TurboModuleRegist
 export * from '../Libraries/Types/CoreEventTypes';
 export * from '../Libraries/Utilities/Appearance';
 export * from '../Libraries/Utilities/BackHandler';
+export * from '../src/private/devmenu/DevMenu';
 export * from '../Libraries/Utilities/DevSettings';
 export * from '../Libraries/Utilities/Dimensions';
 export * from '../Libraries/Utilities/PixelRatio';

package/types/public/ReactNativeTypes.d.ts

@@ -111,10 +111,6 @@ export interface NativeMethods {
    * Removes focus from an input or view. This is the opposite of `focus()`.
    */
   blur(): void;
-
-  refs: {
-    [key: string]: React.Component<any, any>;
-  };
 }
 
 /**

package/Libraries/DevToolsSettings/DevToolsSettingsManager.android.js

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-import DevSettings from '../Utilities/DevSettings';
-import NativeDevToolsSettingsManager from './NativeDevToolsSettingsManager';
-
-module.exports = {
-  setConsolePatchSettings(newSettings: string) {
-    NativeDevToolsSettingsManager?.setConsolePatchSettings(newSettings);
-  },
-  getConsolePatchSettings(): ?string {
-    return NativeDevToolsSettingsManager?.getConsolePatchSettings();
-  },
-  setProfilingSettings(newSettings: string) {
-    if (NativeDevToolsSettingsManager?.setProfilingSettings != null) {
-      NativeDevToolsSettingsManager.setProfilingSettings(newSettings);
-    }
-  },
-  getProfilingSettings(): ?string {
-    if (NativeDevToolsSettingsManager?.getProfilingSettings != null) {
-      return NativeDevToolsSettingsManager.getProfilingSettings();
-    }
-    return null;
-  },
-  reload(): void {
-    DevSettings?.reload();
-  },
-};

package/Libraries/DevToolsSettings/DevToolsSettingsManager.d.ts

@@ -1,20 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-export interface DevToolsSettingsManagerStatic {
-  reload(): void;
-  setConsolePatchSettings(newSettings: string): void;
-  getConsolePatchSettings(): string | null;
-  setProfilingSettings(newSettings: string): void;
-  getProfilingSettings(): string | null;
-}
-
-export const DevToolsSettingsManager: DevToolsSettingsManagerStatic;
-export type DevToolsSettingsManager = DevToolsSettingsManagerStatic;

package/Libraries/DevToolsSettings/DevToolsSettingsManager.ios.js

@@ -1,49 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-import Settings from '../Settings/Settings';
-import DevSettings from '../Utilities/DevSettings';
-
-const CONSOLE_PATCH_SETTINGS_KEY = 'ReactDevTools::ConsolePatchSettings';
-const PROFILING_SETTINGS_KEY = 'ReactDevTools::ProfilingSettings';
-
-const DevToolsSettingsManager = {
-  setConsolePatchSettings(newConsolePatchSettings: string): void {
-    Settings.set({
-      [CONSOLE_PATCH_SETTINGS_KEY]: newConsolePatchSettings,
-    });
-  },
-  getConsolePatchSettings(): ?string {
-    const value = Settings.get(CONSOLE_PATCH_SETTINGS_KEY);
-    if (typeof value === 'string') {
-      return value;
-    }
-    return null;
-  },
-
-  setProfilingSettings(newProfilingSettings: string): void {
-    Settings.set({
-      [PROFILING_SETTINGS_KEY]: newProfilingSettings,
-    });
-  },
-  getProfilingSettings(): ?string {
-    const value = Settings.get(PROFILING_SETTINGS_KEY);
-    if (typeof value === 'string') {
-      return value;
-    }
-    return null;
-  },
-
-  reload(): void {
-    DevSettings?.reload();
-  },
-};
-
-module.exports = DevToolsSettingsManager;

package/Libraries/DevToolsSettings/DevToolsSettingsManager.win32.js

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-import DevSettings from '../Utilities/DevSettings';
-import NativeDevToolsSettingsManager from './NativeDevToolsSettingsManager';
-
-module.exports = {
-  setConsolePatchSettings(newSettings: string) {
-    NativeDevToolsSettingsManager?.setConsolePatchSettings(newSettings);
-  },
-  getConsolePatchSettings(): ?string {
-    return NativeDevToolsSettingsManager?.getConsolePatchSettings();
-  },
-  setProfilingSettings(newSettings: string) {
-    if (NativeDevToolsSettingsManager?.setProfilingSettings != null) {
-      NativeDevToolsSettingsManager.setProfilingSettings(newSettings);
-    }
-  },
-  getProfilingSettings(): ?string {
-    if (NativeDevToolsSettingsManager?.getProfilingSettings != null) {
-      return NativeDevToolsSettingsManager.getProfilingSettings();
-    }
-    return null;
-  },
-  reload(): void {
-    DevSettings?.reload();
-  },
-};

package/Libraries/DevToolsSettings/NativeDevToolsSettingsManager.js

@@ -1,13 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-export * from '../../src/private/specs/modules/NativeDevToolsSettingsManager';
-import NativeDevToolsSettingsManager from '../../src/private/specs/modules/NativeDevToolsSettingsManager';
-export default NativeDevToolsSettingsManager;