diff --git a/interface/src/components/Graph/CommentBox.tsx b/interface/src/components/Graph/CommentBox.tsx index 837bc4b4..0b5ad922 100644 --- a/interface/src/components/Graph/CommentBox.tsx +++ b/interface/src/components/Graph/CommentBox.tsx @@ -124,6 +124,7 @@ export function CommentBox(props: Props) { return (
{ }); if (gesture.pointers.length === 1) { + const target = e.target as HTMLElement; + const button = target.closest("button"); + + if ( + button?.classList.contains("cursor-pointer") && + button.classList.contains("outline-none") && + button.classList.contains("h-full") + ) { + const nodeElement = button.closest( + "[class*='absolute']", + ); + + if (nodeElement) { + const nodeIdAttr = + nodeElement.getAttribute("data-node-id"); + if (nodeIdAttr) { + handleSelectableItemPointerDown( + e as unknown as MouseEvent, + ctx, + interfaceCtx, + { type: "node", id: parseInt(nodeIdAttr) }, + ); + return; + } + + const boxIdAttr = + nodeElement.getAttribute("data-commentbox-id"); + if (boxIdAttr) { + handleSelectableItemPointerDown( + e as unknown as MouseEvent, + ctx, + interfaceCtx, + { + type: "commentBox", + id: parseInt(boxIdAttr), + }, + ); + return; + } + } + } + createDragAreaSession(start); } else if (gesture.pointers.length === 2) { const left = gesture.pointers[0]!; diff --git a/interface/src/components/Graph/Node.tsx b/interface/src/components/Graph/Node.tsx index 41acf516..eafb0066 100644 --- a/interface/src/components/Graph/Node.tsx +++ b/interface/src/components/Graph/Node.tsx @@ -230,6 +230,7 @@ export const Node = (props: Props) => {
; }; - export type Built = Engine extends PackageEngine< - infer ClientRpcs, - infer RuntimeRpcs, - any, - infer ClientState, - infer Resources - > - ? LayerBuilderRet - : never; + export type Built = + Engine extends PackageEngine< + infer ClientRpcs, + infer RuntimeRpcs, + any, + infer ClientState, + infer Resources + > + ? LayerBuilderRet + : never; export type LayerBuilderRet< ClientRpcs extends Rpc.Any, @@ -182,39 +183,24 @@ export namespace PackageEngine { >) as any; }; - export type ClientRpcs = Engine extends PackageEngine< - infer ClientRpcs, - any, - any, - any, - any - > - ? ClientRpcs - : never; + export type ClientRpcs = + Engine extends PackageEngine + ? ClientRpcs + : never; - export type RuntimeRpcs = Engine extends PackageEngine< - any, - infer RuntimeRpcs, - any, - any, - any - > - ? RuntimeRpcs - : never; + export type RuntimeRpcs = + Engine extends PackageEngine + ? RuntimeRpcs + : never; export type RuntimeRpcClient = RpcClient.RpcClient< RuntimeRpcs >; - export type Events = Engine extends PackageEngine< - any, - any, - infer Events, - any, - any - > - ? S.Schema.Type - : never; + export type Events = + Engine extends PackageEngine + ? S.Schema.Type + : never; export type AnyEvent = { _tag: string } & S.Any; } @@ -395,17 +381,18 @@ export namespace Schema { options?: { name?: string }, ) => DataOutput; - export type InferIO = IO extends DataInput - ? T.Infer_ - : IO extends DataOutput - ? (v: T.Infer_) => void - : IO extends ExecOutput - ? IO - : IO extends ExecInput - ? never - : IO extends Record - ? { [K in keyof IO]: InferIO } - : IO; + export type InferIO = + IO extends DataInput + ? T.Infer_ + : IO extends DataOutput + ? (v: T.Infer_) => void + : IO extends ExecOutput + ? IO + : IO extends ExecInput + ? never + : IO extends Record + ? { [K in keyof IO]: InferIO } + : IO; export type AnyIOCtx< Engine extends PackageEngine.Any, diff --git a/packages/project-domain/src/NodeSchema.ts b/packages/project-domain/src/NodeSchema.ts index 34f61136..9de262f7 100644 --- a/packages/project-domain/src/NodeSchema.ts +++ b/packages/project-domain/src/NodeSchema.ts @@ -92,12 +92,10 @@ export namespace Resource { } } - export type ToHandler = T extends Resource.Resource< - infer TId, - infer TValue - > - ? Handler - : never; + export type ToHandler = + T extends Resource.Resource + ? Handler + : never; export const make = () => diff --git a/packages/runtime/src/models/Package.ts b/packages/runtime/src/models/Package.ts index 941bd013..c9d33cc1 100644 --- a/packages/runtime/src/models/Package.ts +++ b/packages/runtime/src/models/Package.ts @@ -253,16 +253,14 @@ export type ResourceType< | { type: BaseType } ); -export type inferResourceTypeValue = T extends ResourceType< - infer TValue, - any -> - ? T extends { source: any } - ? TValue - : T extends { type: BaseType } - ? t.infer - : never - : never; +export type inferResourceTypeValue = + T extends ResourceType + ? T extends { source: any } + ? TValue + : T extends { type: BaseType } + ? t.infer + : never + : never; type DistributiveOmit = T extends any ? Omit diff --git a/packages/typesystem-old/src/struct.ts b/packages/typesystem-old/src/struct.ts index e2112f93..3b50d882 100644 --- a/packages/typesystem-old/src/struct.ts +++ b/packages/typesystem-old/src/struct.ts @@ -144,16 +144,16 @@ export class StructType< } } -export type InferStruct = S extends Struct - ? InferStructFields - : never; +export type InferStruct = + S extends Struct ? InferStructFields : never; export type InferStructFields = F extends StructFields ? { [K in keyof F]: InferStructField } : never; -export type InferStructField = F extends Field - ? Type extends BaseType - ? TOut - : never - : never; +export type InferStructField = + F extends Field + ? Type extends BaseType + ? TOut + : never + : never;