@office-iss/react-native-win32 0.0.0-canary.247 → 0.0.0-canary.248

package/src/private/webapis/dom/geometry/DOMRectReadOnly.js

@@ -33,10 +33,10 @@ function castToNumber(value: mixed): number {
  * This is a (mostly) spec-compliant version of `DOMRectReadOnly` (https://developer.mozilla.org/en-US/docs/Web/API/DOMRectReadOnly).
  */
 export default class DOMRectReadOnly {
-  _x: number;
-  _y: number;
-  _width: number;
-  _height: number;
+  #x: number;
+  #y: number;
+  #width: number;
+  #height: number;
 
   constructor(x: ?number, y: ?number, width: ?number, height: ?number) {
     this.__setInternalX(x);
@@ -49,36 +49,36 @@ export default class DOMRectReadOnly {
    * The x coordinate of the `DOMRectReadOnly`'s origin.
    */
   get x(): number {
-    return this._x;
+    return this.#x;
   }
 
   /**
    * The y coordinate of the `DOMRectReadOnly`'s origin.
    */
   get y(): number {
-    return this._y;
+    return this.#y;
   }
 
   /**
    * The width of the `DOMRectReadOnly`.
    */
   get width(): number {
-    return this._width;
+    return this.#width;
   }
 
   /**
    * The height of the `DOMRectReadOnly`.
    */
   get height(): number {
-    return this._height;
+    return this.#height;
   }
 
   /**
    * Returns the top coordinate value of the `DOMRect` (has the same value as `y`, or `y + height` if `height` is negative).
    */
   get top(): number {
-    const height = this._height;
-    const y = this._y;
+    const height = this.#height;
+    const y = this.#y;
 
     if (height < 0) {
       return y + height;
@@ -91,8 +91,8 @@ export default class DOMRectReadOnly {
    * Returns the right coordinate value of the `DOMRect` (has the same value as ``x + width`, or `x` if `width` is negative).
    */
   get right(): number {
-    const width = this._width;
-    const x = this._x;
+    const width = this.#width;
+    const x = this.#x;
 
     if (width < 0) {
       return x;
@@ -105,8 +105,8 @@ export default class DOMRectReadOnly {
    * Returns the bottom coordinate value of the `DOMRect` (has the same value as `y + height`, or `y` if `height` is negative).
    */
   get bottom(): number {
-    const height = this._height;
-    const y = this._y;
+    const height = this.#height;
+    const y = this.#y;
 
     if (height < 0) {
       return y;
@@ -119,8 +119,8 @@ export default class DOMRectReadOnly {
    * Returns the left coordinate value of the `DOMRect` (has the same value as `x`, or `x + width` if `width` is negative).
    */
   get left(): number {
-    const width = this._width;
-    const x = this._x;
+    const width = this.#width;
+    const x = this.#x;
 
     if (width < 0) {
       return x + width;
@@ -155,34 +155,34 @@ export default class DOMRectReadOnly {
   }
 
   __getInternalX(): number {
-    return this._x;
+    return this.#x;
   }
 
   __getInternalY(): number {
-    return this._y;
+    return this.#y;
   }
 
   __getInternalWidth(): number {
-    return this._width;
+    return this.#width;
   }
 
   __getInternalHeight(): number {
-    return this._height;
+    return this.#height;
   }
 
   __setInternalX(x: ?number) {
-    this._x = castToNumber(x);
+    this.#x = castToNumber(x);
   }
 
   __setInternalY(y: ?number) {
-    this._y = castToNumber(y);
+    this.#y = castToNumber(y);
   }
 
   __setInternalWidth(width: ?number) {
-    this._width = castToNumber(width);
+    this.#width = castToNumber(width);
   }
 
   __setInternalHeight(height: ?number) {
-    this._height = castToNumber(height);
+    this.#height = castToNumber(height);
   }
 }

package/src/private/webapis/dom/nodes/ReactNativeElement.js

@@ -44,7 +44,7 @@ export default class ReactNativeElement
   __nativeTag: number;
   __internalInstanceHandle: InternalInstanceHandle;
 
-  _viewConfig: ViewConfig;
+  #viewConfig: ViewConfig;
 
   constructor(
     tag: number,
@@ -55,7 +55,7 @@ export default class ReactNativeElement
 
     this.__nativeTag = tag;
     this.__internalInstanceHandle = internalInstanceHandle;
-    this._viewConfig = viewConfig;
+    this.#viewConfig = viewConfig;
   }
 
   get offsetHeight(): number {
@@ -172,12 +172,12 @@ export default class ReactNativeElement
 
   setNativeProps(nativeProps: {...}): void {
     if (__DEV__) {
-      warnForStyleProps(nativeProps, this._viewConfig.validAttributes);
+      warnForStyleProps(nativeProps, this.#viewConfig.validAttributes);
     }
 
     const updatePayload = createAttributePayload(
       nativeProps,
-      this._viewConfig.validAttributes,
+      this.#viewConfig.validAttributes,
     );
 
     const node = getShadowNode(this);

package/src/private/webapis/dom/oldstylecollections/DOMRectList.js

@@ -20,7 +20,7 @@ import {createValueIterator} from './ArrayLikeUtils';
 
 // $FlowIssue[prop-missing] Flow doesn't understand [Symbol.iterator]() {} and thinks this class doesn't implement the Iterable interface.
 export default class DOMRectList implements Iterable<DOMRectReadOnly> {
-  _length: number;
+  #length: number;
 
   /**
    * Use `createDOMRectList` to create instances of this class.
@@ -38,15 +38,15 @@ export default class DOMRectList implements Iterable<DOMRectReadOnly> {
       });
     }
 
-    this._length = elements.length;
+    this.#length = elements.length;
   }
 
   get length(): number {
-    return this._length;
+    return this.#length;
   }
 
   item(index: number): DOMRectReadOnly | null {
-    if (index < 0 || index >= this._length) {
+    if (index < 0 || index >= this.#length) {
       return null;
     }
 

package/src/private/webapis/dom/oldstylecollections/HTMLCollection.js

@@ -19,7 +19,7 @@ import {createValueIterator} from './ArrayLikeUtils';
 
 // $FlowIssue[prop-missing] Flow doesn't understand [Symbol.iterator]() {} and thinks this class doesn't implement the Iterable<T> interface.
 export default class HTMLCollection<T> implements Iterable<T>, ArrayLike<T> {
-  _length: number;
+  #length: number;
 
   /**
    * Use `createHTMLCollection` to create instances of this class.
@@ -37,15 +37,15 @@ export default class HTMLCollection<T> implements Iterable<T>, ArrayLike<T> {
       });
     }
 
-    this._length = elements.length;
+    this.#length = elements.length;
   }
 
   get length(): number {
-    return this._length;
+    return this.#length;
   }
 
   item(index: number): T | null {
-    if (index < 0 || index >= this._length) {
+    if (index < 0 || index >= this.#length) {
       return null;
     }
 

package/src/private/webapis/dom/oldstylecollections/NodeList.js

@@ -23,7 +23,7 @@ import {
 
 // $FlowIssue[prop-missing] Flow doesn't understand [Symbol.iterator]() {} and thinks this class doesn't implement the Iterable<T> interface.
 export default class NodeList<T> implements Iterable<T>, ArrayLike<T> {
-  _length: number;
+  #length: number;
 
   /**
    * Use `createNodeList` to create instances of this class.
@@ -38,15 +38,15 @@ export default class NodeList<T> implements Iterable<T>, ArrayLike<T> {
         writable: false,
       });
     }
-    this._length = elements.length;
+    this.#length = elements.length;
   }
 
   get length(): number {
-    return this._length;
+    return this.#length;
   }
 
   item(index: number): T | null {
-    if (index < 0 || index >= this._length) {
+    if (index < 0 || index >= this.#length) {
       return null;
     }
 
@@ -70,7 +70,7 @@ export default class NodeList<T> implements Iterable<T>, ArrayLike<T> {
     // eslint-disable-next-line consistent-this
     const arrayLike: ArrayLike<T> = this;
 
-    for (let index = 0; index < this._length; index++) {
+    for (let index = 0; index < this.#length; index++) {
       if (thisArg == null) {
         callbackFn(arrayLike[index], index, this);
       } else {

package/src/private/webapis/performance/MemoryInfo.js

@@ -19,15 +19,15 @@ type MemoryInfoLike = {
 
 // Read-only object with JS memory information. This is returned by the performance.memory API.
 export default class MemoryInfo {
-  _jsHeapSizeLimit: ?number;
-  _totalJSHeapSize: ?number;
-  _usedJSHeapSize: ?number;
+  #jsHeapSizeLimit: ?number;
+  #totalJSHeapSize: ?number;
+  #usedJSHeapSize: ?number;
 
   constructor(memoryInfo: ?MemoryInfoLike) {
     if (memoryInfo != null) {
-      this._jsHeapSizeLimit = memoryInfo.jsHeapSizeLimit;
-      this._totalJSHeapSize = memoryInfo.totalJSHeapSize;
-      this._usedJSHeapSize = memoryInfo.usedJSHeapSize;
+      this.#jsHeapSizeLimit = memoryInfo.jsHeapSizeLimit;
+      this.#totalJSHeapSize = memoryInfo.totalJSHeapSize;
+      this.#usedJSHeapSize = memoryInfo.usedJSHeapSize;
     }
   }
 
@@ -35,20 +35,20 @@ export default class MemoryInfo {
    * The maximum size of the heap, in bytes, that is available to the context
    */
   get jsHeapSizeLimit(): ?number {
-    return this._jsHeapSizeLimit;
+    return this.#jsHeapSizeLimit;
   }
 
   /**
    * The total allocated heap size, in bytes
    */
   get totalJSHeapSize(): ?number {
-    return this._totalJSHeapSize;
+    return this.#totalJSHeapSize;
   }
 
   /**
    * The currently active segment of JS heap, in bytes.
    */
   get usedJSHeapSize(): ?number {
-    return this._usedJSHeapSize;
+    return this.#usedJSHeapSize;
   }
 }

package/src/private/webapis/performance/PerformanceObserver.js

@@ -25,18 +25,18 @@ export type PerformanceEntryList = $ReadOnlyArray<PerformanceEntry>;
 export {PerformanceEntry} from './PerformanceEntry';
 
 export class PerformanceObserverEntryList {
-  _entries: PerformanceEntryList;
+  #entries: PerformanceEntryList;
 
   constructor(entries: PerformanceEntryList) {
-    this._entries = entries;
+    this.#entries = entries;
   }
 
   getEntries(): PerformanceEntryList {
-    return this._entries;
+    return this.#entries;
   }
 
   getEntriesByType(type: PerformanceEntryType): PerformanceEntryList {
-    return this._entries.filter(entry => entry.entryType === type);
+    return this.#entries.filter(entry => entry.entryType === type);
   }
 
   getEntriesByName(
@@ -44,9 +44,9 @@ export class PerformanceObserverEntryList {
     type?: PerformanceEntryType,
   ): PerformanceEntryList {
     if (type === undefined) {
-      return this._entries.filter(entry => entry.name === name);
+      return this.#entries.filter(entry => entry.name === name);
     } else {
-      return this._entries.filter(
+      return this.#entries.filter(
         entry => entry.name === name && entry.entryType === type,
       );
     }
@@ -175,11 +175,11 @@ function getSupportedPerformanceEntryTypes(): $ReadOnlyArray<PerformanceEntryTyp
  * observer.observe({ type: "event" });
  */
 export default class PerformanceObserver {
-  _callback: PerformanceObserverCallback;
-  _type: 'single' | 'multiple' | void;
+  #callback: PerformanceObserverCallback;
+  #type: 'single' | 'multiple' | void;
 
   constructor(callback: PerformanceObserverCallback) {
-    this._callback = callback;
+    this.#callback = callback;
   }
 
   observe(options: PerformanceObserverInit): void {
@@ -188,17 +188,17 @@ export default class PerformanceObserver {
       return;
     }
 
-    this._validateObserveOptions(options);
+    this.#validateObserveOptions(options);
 
     let requestedEntryTypes;
 
     if (options.entryTypes) {
-      this._type = 'multiple';
+      this.#type = 'multiple';
       requestedEntryTypes = new Map(
         options.entryTypes.map(t => [t, undefined]),
       );
     } else {
-      this._type = 'single';
+      this.#type = 'single';
       requestedEntryTypes = new Map([
         [options.type, options.durationThreshold],
       ]);
@@ -217,7 +217,7 @@ export default class PerformanceObserver {
     }
 
     registeredObservers.set(this, {
-      callback: this._callback,
+      callback: this.#callback,
       entryTypes: nextEntryTypes,
     });
 
@@ -284,7 +284,7 @@ export default class PerformanceObserver {
     applyDurationThresholds();
   }
 
-  _validateObserveOptions(options: PerformanceObserverInit): void {
+  #validateObserveOptions(options: PerformanceObserverInit): void {
     const {type, entryTypes, durationThreshold} = options;
 
     if (!type && !entryTypes) {
@@ -299,13 +299,13 @@ export default class PerformanceObserver {
       );
     }
 
-    if (this._type === 'multiple' && type) {
+    if (this.#type === 'multiple' && type) {
       throw new Error(
         "Failed to execute 'observe' on 'PerformanceObserver': This observer has performed observe({entryTypes:...}, therefore it cannot perform observe({type:...})",
       );
     }
 
-    if (this._type === 'single' && entryTypes) {
+    if (this.#type === 'single' && entryTypes) {
       throw new Error(
         "Failed to execute 'observe' on 'PerformanceObserver': This PerformanceObserver has performed observe({type:...}, therefore it cannot perform observe({entryTypes:...})",
       );

package/src/private/webapis/performance/ReactNativeStartupTiming.js

@@ -27,22 +27,22 @@ export default class ReactNativeStartupTiming {
   // We do NOT match web spect here for two reasons:
   // 1. The `ReactNativeStartupTiming` is non-standard API
   // 2. The timing information is relative to the time origin, which means `0` has valid meaning
-  _startTime: ?number;
-  _endTime: ?number;
-  _initializeRuntimeStart: ?number;
-  _initializeRuntimeEnd: ?number;
-  _executeJavaScriptBundleEntryPointStart: ?number;
-  _executeJavaScriptBundleEntryPointEnd: ?number;
+  #startTime: ?number;
+  #endTime: ?number;
+  #initializeRuntimeStart: ?number;
+  #initializeRuntimeEnd: ?number;
+  #executeJavaScriptBundleEntryPointStart: ?number;
+  #executeJavaScriptBundleEntryPointEnd: ?number;
 
   constructor(startUpTiming: ?ReactNativeStartupTimingLike) {
     if (startUpTiming != null) {
-      this._startTime = startUpTiming.startTime;
-      this._endTime = startUpTiming.endTime;
-      this._initializeRuntimeStart = startUpTiming.initializeRuntimeStart;
-      this._initializeRuntimeEnd = startUpTiming.initializeRuntimeEnd;
-      this._executeJavaScriptBundleEntryPointStart =
+      this.#startTime = startUpTiming.startTime;
+      this.#endTime = startUpTiming.endTime;
+      this.#initializeRuntimeStart = startUpTiming.initializeRuntimeStart;
+      this.#initializeRuntimeEnd = startUpTiming.initializeRuntimeEnd;
+      this.#executeJavaScriptBundleEntryPointStart =
         startUpTiming.executeJavaScriptBundleEntryPointStart;
-      this._executeJavaScriptBundleEntryPointEnd =
+      this.#executeJavaScriptBundleEntryPointEnd =
         startUpTiming.executeJavaScriptBundleEntryPointEnd;
     }
   }
@@ -51,41 +51,41 @@ export default class ReactNativeStartupTiming {
    * Start time of the RN app startup process. This is provided by the platform by implementing the `ReactMarker.setAppStartTime` API in the native platform code.
    */
   get startTime(): ?number {
-    return this._startTime;
+    return this.#startTime;
   }
 
   /**
    * End time of the RN app startup process. This is equal to `executeJavaScriptBundleEntryPointEnd`.
    */
   get endTime(): ?number {
-    return this._endTime;
+    return this.#endTime;
   }
 
   /**
    * Start time when RN runtime get initialized. This is when RN infra first kicks in app startup process.
    */
   get initializeRuntimeStart(): ?number {
-    return this._initializeRuntimeStart;
+    return this.#initializeRuntimeStart;
   }
 
   /**
    * End time when RN runtime get initialized. This is the last marker before ends of the app startup process.
    */
   get initializeRuntimeEnd(): ?number {
-    return this._initializeRuntimeEnd;
+    return this.#initializeRuntimeEnd;
   }
 
   /**
    * Start time of JS bundle being executed. This indicates the RN JS bundle is loaded and start to be evaluated.
    */
   get executeJavaScriptBundleEntryPointStart(): ?number {
-    return this._executeJavaScriptBundleEntryPointStart;
+    return this.#executeJavaScriptBundleEntryPointStart;
   }
 
   /**
    * End time of JS bundle being executed. This indicates all the synchronous entry point jobs are finished.
    */
   get executeJavaScriptBundleEntryPointEnd(): ?number {
-    return this._executeJavaScriptBundleEntryPointEnd;
+    return this.#executeJavaScriptBundleEntryPointEnd;
   }
 }

package/src-win/Libraries/Components/View/ViewPropTypes.d.ts

@@ -88,6 +88,13 @@ export interface ViewPropsAndroid {
    */
   collapsable?: boolean | undefined;
 
+  /**
+   * Setting to false prevents direct children of the view from being removed
+   * from the native view hierarchy, similar to the effect of setting
+   * `collapsable={false}` on each child.
+   */
+  collapsableChildren?: boolean | undefined;
+
   /**
    * Whether this view should render itself (and all of its children) into a single hardware texture on the GPU.
    *