@simplysm/angular 14.1.2 → 14.1.6

package/src/core/mark.ts

@@ -4,6 +4,6 @@ import type { WritableSignal } from "@angular/core";
  * WritableSignal의 값이 in-place mutation된 후 소비자에게 변경을 알린다.
  * shallow copy로 새 참조를 생성하여 signal을 업데이트한다.
  */
-export function mark(sig: WritableSignal<any>): void {
-  sig.update((v) => (Array.isArray(v) ? [...v] : { ...v }));
+export function mark<T extends object>(sig: WritableSignal<T>): void {
+  sig.update((v) => (Array.isArray(v) ? [...(v as unknown[])] : { ...v }) as T);
 }

package/src/core/setupModelHook.ts

@@ -1,7 +1,7 @@
 import { ErrorHandler, inject, type Signal, type WritableSignal } from "@angular/core";
 
-export function setupModelHook<T, S extends WritableSignal<T>>(
-  model: S,
+export function setupModelHook<T>(
+  model: WritableSignal<T>,
   canFn: Signal<(item: T) => boolean | Promise<boolean>>,
 ): void {
   const errorHandler = inject(ErrorHandler);

package/src/data/shared-data/sd-shared-data-select-button.ts

@@ -57,10 +57,10 @@ import type { SelectModeValue } from "../../controls/select/sd-select";
 })
 export class SdSharedDataSelectButton<
   TItem extends SharedDataBase<string | number>,
-  TMode extends keyof SelectModeValue<string | number>,
+  TMode extends keyof SelectModeValue<TItem>,
   TModal extends SdSelectModal<any>,
 > {
-  value = model<SelectModeValue<string | number>[TMode]>();
+  value = model<SelectModeValue<TItem["__valueKey"] | undefined>[TMode]>();
   items = input<TItem[]>([]);
   modal = input.required<SdSelectModalInfo<TModal>>();
   selectMode = input<TMode>("single" as TMode);

package/src/data/sheet/sd-sheet-column.ts

@@ -19,7 +19,7 @@ export interface SdSheetCellContext<T = unknown> {
   selector: "sd-sheet-column",
   standalone: true,
 })
-export class SdSheetColumn<T = unknown> {
+export class SdSheetColumn {
   key = input.required<string>();
   header = input<string | string[]>("");
   headerStyle = input<string>();
@@ -32,7 +32,7 @@ export class SdSheetColumn<T = unknown> {
   disableResizing = input(false, { transform: booleanAttribute });
   ordering = input(0);
 
-  cellTplRef = contentChild.required<SdSheetColumnCellTemplate<T>, TemplateRef<SdSheetCellContext<T>>>(
+  cellTplRef = contentChild.required<SdSheetColumnCellTemplate<unknown>, TemplateRef<SdSheetCellContext<unknown>>>(
     SdSheetColumnCellTemplate,
     { read: TemplateRef },
   );

package/src/features/editor/sd-markdown-editor.ts

@@ -19,7 +19,7 @@ import { Editor, type AnyExtension } from "@tiptap/core";
 import StarterKit from "@tiptap/starter-kit";
 import Placeholder from "@tiptap/extension-placeholder";
 import { Markdown } from "@tiptap/markdown";
-import { useTiptapToolbar } from "./useTiptapToolbar";
+import { useTiptapToolbar, type TiptapCommand } from "./useTiptapToolbar";
 
 const DEFAULT_EXTENSIONS: AnyExtension[] = [
   StarterKit,
@@ -236,7 +236,7 @@ export class SdMarkdownEditor {
     });
   }
 
-  execCmd(cmd: string): void {
+  execCmd(cmd: TiptapCommand): void {
     if (this.disabled() || this.readonly()) return;
     this._toolbar.execCmd(cmd);
   }

package/src/features/editor/useTiptapToolbar.ts

@@ -18,6 +18,25 @@ export interface TiptapActiveStates {
   alignJustify: boolean;
 }
 
+export type TiptapCommand =
+  | "bold"
+  | "italic"
+  | "underline"
+  | "strike"
+  | "h1"
+  | "h2"
+  | "bulletList"
+  | "orderedList"
+  | "indent"
+  | "outdent"
+  | "blockquote"
+  | "codeBlock"
+  | "alignLeft"
+  | "alignCenter"
+  | "alignRight"
+  | "alignJustify"
+  | "clean";
+
 export const DEFAULT_ACTIVE_STATES: TiptapActiveStates = {
   h1: false,
   h2: false,
@@ -44,7 +63,7 @@ export function useTiptapToolbar(opt: TiptapToolbarOptions): {
   activeColor: WritableSignal<string>;
   activeBgColor: WritableSignal<string>;
   colorPickerMode: WritableSignal<"text" | "bg" | undefined>;
-  execCmd: (cmd: string) => void;
+  execCmd: (cmd: TiptapCommand) => void;
   refreshActiveStates: () => void;
   toggleColorPicker: (mode: "text" | "bg") => void;
   applyColor: (color: string | undefined) => void;
@@ -54,7 +73,7 @@ export function useTiptapToolbar(opt: TiptapToolbarOptions): {
   const activeBgColor = signal("");
   const colorPickerMode = signal<"text" | "bg" | undefined>(undefined);
 
-  function execCmd(cmd: string): void {
+  function execCmd(cmd: TiptapCommand): void {
     const ed = opt.editor();
     if (ed == null) return;