[pull] master from DefinitelyTyped:master

types/gorilla-engine/components/MappingEditor.d.ts

@@ -11,6 +11,8 @@ declare namespace GorillaEngine.UI {
     }
     interface MappingEditorProps extends Common, Bounds, Background, Clickable {
         zones?: Zone[];
+        verticalZoom?: number;
+        horizontalZoom?: number;
         refreshView(index?: number): void;
         selectAllZones(): void;
         deselectAllZones(): void;

types/gorilla-engine/gorilla-engine-tests.ts

@@ -14,4 +14,4 @@ const label = new GorillaEngine.UI.Label({ margin: 5 });
 
 const slider = new GorillaEngine.UI.Slider({ id: "slider", x: 0 });
 
-const mappingEditor = new GorillaEngine.UI.MappingEditor({ id: "myNewMappingEditor", x: 0, y: 0 });
+const mappingEditor = new GorillaEngine.UI.MappingEditor({ id: "myNewMappingEditor", x: 0, y: 2 });

types/react-dom/canary.d.ts

@@ -30,3 +30,8 @@ import React = require("react");
 import ReactDOM = require(".");
 
 export {};
+
+declare module "react" {
+    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    interface CacheSignal extends AbortSignal {}
+}

types/react-dom/test/canary-tests.tsx

@@ -2,3 +2,16 @@
 import React = require("react");
 import ReactDOM = require("react-dom");
 import ReactDOMClient = require("react-dom/client");
+
+function cacheSignalTest() {
+    const cacheSignal = React.cacheSignal;
+
+    const signal = cacheSignal();
+    if (signal !== null) {
+        // $ExpectType CacheSignal
+        signal;
+        if (signal.aborted) {
+            console.error(signal.reason);
+        }
+    }
+}

types/react/canary.d.ts

@@ -32,4 +32,7 @@ type VoidOrUndefinedOnly = void | { [UNDEFINED_VOID_ONLY]: never };
 
 declare module "." {
     export function unstable_useCacheRefresh(): () => void;
+
+    export interface CacheSignal {}
+    export function cacheSignal(): null | CacheSignal;
 }

types/react/test/canary.tsx

@@ -25,3 +25,15 @@ function useCacheTest() {
         refresh(() => "refresh");
     }
 }
+
+function cacheSignalTest() {
+    const cacheSignal = React.cacheSignal;
+
+    const signal = cacheSignal();
+    if (signal !== null) {
+        // $ExpectType CacheSignal
+        signal;
+        // @ts-expect-error -- implemented by renderer
+        signal.aborted;
+    }
+}

types/react/ts5.0/canary.d.ts

@@ -32,4 +32,7 @@ type VoidOrUndefinedOnly = void | { [UNDEFINED_VOID_ONLY]: never };
 
 declare module "." {
     export function unstable_useCacheRefresh(): () => void;
+
+    export interface CacheSignal {}
+    export function cacheSignal(): null | CacheSignal;
 }

types/react/ts5.0/test/canary.tsx

@@ -25,3 +25,15 @@ function useCacheTest() {
         refresh(() => "refresh");
     }
 }
+
+function cacheSignalTest() {
+    const cacheSignal = React.cacheSignal;
+
+    const signal = cacheSignal();
+    if (signal !== null) {
+        // $ExpectType CacheSignal
+        signal;
+        // @ts-expect-error -- implemented by renderer
+        signal.aborted;
+    }
+}