c063 1.1.2 → 1.1.4

package/dist/types/common.d.ts

@@ -3,7 +3,7 @@ export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K
 /** 用於重載同名屬性（用於覆蓋類型 T 中與類型 P 相同名稱的屬性，並保留其餘屬性*/
 export type OverrideProps<T, P> = DistributiveOmit<T, keyof P> & P;
 /** 支援元件型別 (可複寫屬性)*/
-export type AsComponentProps<Component extends React.ElementType, PermanentProps extends object = {}> = OverrideProps<React.ComponentProps<Component>, {
+export type AsComponentProps<As extends React.ElementType, PermanentProps extends object = {}> = OverrideProps<React.ComponentPropsWithRef<As>, PermanentProps> & {
     /** 指定用於渲染的 React 元件（可為任意元件*/
-    as?: Component;
-} & PermanentProps>;
+    as?: As;
+};

package/dist/types/props.d.ts

@@ -6,13 +6,13 @@ export type CodeTokenType = `keyword-${KeywordColorType}` | "string" | "number"
  *
  * @template T HTML 或客製元素，例如 span、a、Link 等
  */
-export type CodeTokenProps<T extends React.ElementType = React.ElementType<React.HTMLAttributes<HTMLElement>>> = AsComponentProps<T, {
+export type CodeTokenProps<T extends React.ElementType = React.ElementType> = AsComponentProps<T, {
     /**
      * 語法 token 的語意類型，用於指定樣式顏色。
      */
     type?: CodeTokenType;
 }>;
-export type CodeTokenBuilder = (children: CodeTokenProps["children"], props?: DistributiveOmit<CodeTokenProps, "type">) => CodeTokenProps;
+export type CodeTokenBuilder<T extends React.ElementType = "span"> = (children: CodeTokenProps<T>["children"], props?: DistributiveOmit<CodeTokenProps<T>, "type">) => CodeTokenProps<T>;
 /**
  * 用於單一程式碼行的屬性，用在 <CodeLine /> 或類似元件中。
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "c063",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "A React component for displaying code snippets with syntax highlighting.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/types/common.tsx

@@ -8,12 +8,9 @@ export type OverrideProps<T, P> = DistributiveOmit<T, keyof P> & P;
 
 /** 支援元件型別 (可複寫屬性)*/
 export type AsComponentProps<
-  Component extends React.ElementType,
+  As extends React.ElementType,
   PermanentProps extends object = {}
-> = OverrideProps<
-  React.ComponentProps<Component>,
-  {
-    /** 指定用於渲染的 React 元件（可為任意元件*/
-    as?: Component;
-  } & PermanentProps
->;
+> = OverrideProps<React.ComponentPropsWithRef<As>, PermanentProps> & {
+  /** 指定用於渲染的 React 元件（可為任意元件*/
+  as?: As;
+};

package/src/types/props.tsx

@@ -21,24 +21,21 @@ export type CodeTokenType =
  *
  * @template T HTML 或客製元素，例如 span、a、Link 等
  */
-export type CodeTokenProps<
-  T extends React.ElementType = React.ElementType<
-    React.HTMLAttributes<HTMLElement>
-  >
-> = AsComponentProps<
-  T,
-  {
-    /**
-     * 語法 token 的語意類型，用於指定樣式顏色。
-     */
-    type?: CodeTokenType;
-  }
->;
+export type CodeTokenProps<T extends React.ElementType = React.ElementType> =
+  AsComponentProps<
+    T,
+    {
+      /**
+       * 語法 token 的語意類型，用於指定樣式顏色。
+       */
+      type?: CodeTokenType;
+    }
+  >;
 
-export type CodeTokenBuilder = (
-  children: CodeTokenProps["children"],
-  props?: DistributiveOmit<CodeTokenProps, "type">
-) => CodeTokenProps;
+export type CodeTokenBuilder<T extends React.ElementType = "span"> = (
+  children: CodeTokenProps<T>["children"],
+  props?: DistributiveOmit<CodeTokenProps<T>, "type">
+) => CodeTokenProps<T>;
 
 /**
  * 用於單一程式碼行的屬性，用在 <CodeLine /> 或類似元件中。