Merge pull request #8 from steelydylan/hotfix/0.3.1

chore: vup to 1.3.1

Author: steelydylan

.github/workflows/publish.yml

@@ -24,13 +24,16 @@ jobs:
       - name: install
         run: yarn --frozen-lockfile
       # まだtagがないバージョンなら、Git Tagをpushする
+      - name: package-version
+        run: node -p -e '`PACKAGE_VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
       - name: package-version-to-git-tag
         uses: pkgdeps/action-package-version-to-git-tag@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_repo: ${{ github.repository }}
           git_commit_sha: ${{ github.sha }}
           git_tag_prefix: ""
+          version: ${{ env.PACKAGE_VERSION }}
       - name: get-npm-version
         id: package-version
         uses: martinbeentjes/npm-get-version-action@master

README.md

@@ -24,8 +24,10 @@ Not Yet
 
 ## Install
 
+You should also import zenn-markdown-html as peer dependencies
+
 ```sh
-$ npm install react-split-mde --save
+$ npm install react-split-mde zenn-markdown-html --save
 ```
 
 ## Usage
@@ -34,6 +36,7 @@ $ npm install react-split-mde --save
 import React, { useCallback, useState } from 'react';
 import { render } from 'react-dom';
 import { Editor, useProvider } from 'react-split-mde';
+import { parser } from 'react-split-mde/lib/parser';
 import 'react-split-mde/css/index.css';
 
 const MDE = () => {
@@ -44,6 +47,7 @@ const MDE = () => {
 
   return (
     <Editor
+      parser={parser}
       value={markdown}
       onChange={handleValueChange}
     />

demo/index.tsx

@@ -2,6 +2,7 @@ import * as React from "react";
 import { render } from "react-dom";
 import { useProvider } from "../src/hooks";
 import "../css/index.css";
+import { parser } from "../src/parser";
 import { Editor, defaultCommands, EnterKey } from "../src";
 import markdown from "./markdown.txt";
 
@@ -66,6 +67,7 @@ const Main = () => {
       </div>
       <div className="demo">
         <Editor
+          parser={parser}
           value={value}
           onChange={handleValueChange}
           commands={{ 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-split-mde",
-  "version": "0.1.3",
+  "version": "0.3.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -25,7 +25,9 @@
     "morphdom": "^2.6.1",
     "react-textarea-autosize": "^8.3.0",
     "use-eventmit": "^1.0.3",
-    "xss": "^1.0.8",
+    "xss": "^1.0.8"
+  },
+  "peerDependencies": {
     "zenn-markdown-html": "^0.1.70"
   },
   "devDependencies": {
@@ -54,6 +56,7 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.11.0",
-    "worker-loader": "^3.0.3"
+    "worker-loader": "^3.0.3",
+    "zenn-markdown-html": "^0.1.70"
   }
 }

src/commands/bulletList.ts

@@ -16,7 +16,7 @@ const generateSpace = (count: number) => {
 };
 
 export const bulletList: Command = (target, option) => {
-  const { lineAll } = option;
+  const { lineAll, line } = option;
   const lineWithoutSpace = lineAll.replace(/^(\s*)/g, "");
   const spaces = lineAll.match(/^(\s*)/);
   let spaceLength = 0;
@@ -38,6 +38,9 @@ export const bulletList: Command = (target, option) => {
     if (option.metaKey || option.ctrlKey) {
       return { stop: true, change: false };
     }
+    if (line.length === 0) {
+      return { stop: false, change: true };
+    }
     if (lineWithoutSpace.length > 2) {
       const text = startWithHyphen
         ? `\n${generateSpace(spaceLength)}- `

src/commands/orderedList.ts

@@ -16,7 +16,7 @@ const generateSpace = (count: number) => {
 };
 
 export const orderedList: Command = (target, option) => {
-  const { lineAll } = option;
+  const { lineAll, line } = option;
   const lineWithoutSpace = lineAll.replace(/^(\s*)/g, "");
   const spaces = lineAll.match(/^(\s*)/);
   let spaceLength = 0;
@@ -36,6 +36,9 @@ export const orderedList: Command = (target, option) => {
     if (option.ctrlKey || option.metaKey) {
       return { stop: true, change: false };
     }
+    if (line.length === 0) {
+      return { stop: false, change: true };
+    }
     const [_, number] = lineWithoutSpace.match(/^(\d+)/);
     if (lineWithoutSpace.length - number.length <= 2) {
       removeTextAtFirstLine(target, lineAll.length);

src/components/Editor.tsx

@@ -4,14 +4,13 @@ import { Textarea } from "./Textarea";
 import * as defaultCommands from "../commands";
 import { Command } from "../types";
 import { useDebounce } from "../hooks/debounce";
-import { parser as defaultParser } from "../parser";
 
 type Props = {
   commands?: Record<string, Command>;
   previewClassName?: string;
   textareaClassName?: string;
   previewCallback?: Record<string, (node: any) => any>;
-  parser?: (text: string) => Promise<string>;
+  parser: (text: string) => Promise<string>;
   value: string;
   onChange?: (value: string) => void;
   psudoMode?: boolean;
@@ -61,7 +60,7 @@ export const Editor: React.FC<Props> = ({
           value={debouncedValue}
           className={previewClassName}
           callback={previewCallback}
-          parser={parser ?? defaultParser}
+          parser={parser}
         />
       </div>
     </div>

src/components/Textarea.tsx

@@ -77,7 +77,7 @@ export const Textarea = React.forwardRef(
     ref
   ) => {
     const [lineHeightMap, setLineHeightMap] = useState<number[]>([]);
-    const composing = useRef(false)
+    const composing = useRef(false);
     const htmlRef = useRef<HTMLTextAreaElement>();
     const oldScrollRef = useRef<number>(0);
     const historyManager = useRef(