gitalk-react 1.0.0-beta.1 → 1.0.0-beta.3

package/lib/gitalk.tsx

@@ -72,14 +72,12 @@ export interface GitalkProps
    * The unique id of the page.
    * Length must less than 50.
    *
-   * @default location.href
+   * @default location.pathname
    */
   id?: string;
   /**
    * The issue ID of the page.
    * If the number attribute is not defined, issue will be located using id.
-   *
-   * @default -1
    */
   number?: number;
   /**
@@ -201,8 +199,8 @@ const Gitalk: React.FC<GitalkProps> = (props) => {
     owner,
     repo,
     admin,
-    id: propsIssueId = location.href,
-    number: issueNumber = -1,
+    id: propsIssueId = location.pathname,
+    number: propsIssueNumber,
     labels: issueBaseLabels = DEFAULT_LABELS,
     title: issueTitle = document.title,
     body: issueBody = location.href +
@@ -230,6 +228,8 @@ const Gitalk: React.FC<GitalkProps> = (props) => {
     ...restProps
   } = props;
   const issueId = propsIssueId.slice(0, 50);
+  const issueNumber =
+    propsIssueNumber && propsIssueNumber > 0 ? propsIssueNumber : undefined;
   const commentsPerPage =
     propsPerPage > 100 ? 100 : propsPerPage < 0 ? 10 : propsPerPage;
   const defaultUser = propsDefaultUser
@@ -481,7 +481,7 @@ const Gitalk: React.FC<GitalkProps> = (props) => {
     loading: getCommentsLoading,
   } = useRequest(
     async (): Promise<CommentType[]> => {
-      const { number: issueNumber } = issue as IssueType;
+      const { number: currentIssueNumber } = issue as IssueType;
       const from = (commentsPage - 1) * commentsPerPage + 1;
       const to = commentsPage * commentsPerPage;
 
@@ -495,7 +495,7 @@ const Gitalk: React.FC<GitalkProps> = (props) => {
           await octokit.graphql(query, {
             owner,
             repo,
-            id: issueNumber,
+            id: currentIssueNumber,
             pageSize: commentsPerPage,
             ...(commentsCursor ? { cursor: commentsCursor } : {}),
           });
@@ -550,7 +550,7 @@ const Gitalk: React.FC<GitalkProps> = (props) => {
           {
             owner,
             repo,
-            issue_number: issueNumber,
+            issue_number: currentIssueNumber,
             page: commentsPage,
             per_page: commentsPerPage,
             headers: {
@@ -608,14 +608,14 @@ const Gitalk: React.FC<GitalkProps> = (props) => {
     run: runCreateIssueComment,
   } = useRequest(
     async (): Promise<CommentType[]> => {
-      const { number: issueNumber } = issue as IssueType;
+      const { number: currentIssueNumber } = issue as IssueType;
 
       const createIssueCommentRes = await octokit.request(
         "POST /repos/{owner}/{repo}/issues/{issue_number}/comments",
         {
           owner,
           repo,
-          issue_number: issueNumber,
+          issue_number: currentIssueNumber,
           body: inputComment,
           headers: {
             accept: "application/vnd.github.v3.full+json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitalk-react",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "private": false,
   "author": {
     "name": "LolipopJ",
@@ -29,6 +29,7 @@
     "./gitalk-light.css": "./dist/gitalk-light.css",
     "./gitalk-dark.css": "./dist/gitalk-dark.css"
   },
+  "types": "./dist/gitalk.d.ts",
   "scripts": {
     "dev": "vite",
     "build": "npm run build:ts && npm run build:scss",