chore: use father (#11)

* use father

* update now

* add lint file

* fix lint

* clean up ignore

Author: zombieJ

.eslintrc.js

@@ -0,0 +1,9 @@
+const base = require('@umijs/fabric/dist/eslint');
+
+module.exports = {
+  ...base,
+  rules: {
+    ...base.rules,
+    'jsx-a11y/no-autofocus': 0,
+  },
+};

.fatherrc.js

@@ -0,0 +1,8 @@
+export default {
+  cjs: 'babel',
+  esm: { type: 'babel', importLibToEs: true },
+  preCommit: {
+    eslint: true,
+    prettier: true,
+  },
+};

.gitignore

@@ -1,3 +1,4 @@
+.storybook
 *.iml
 *.log
 .idea/
@@ -37,5 +38,5 @@ jest.config.js
 tsconfig.json
 tslint.json
 tsconfig.test.json
-.eslintrc.js
 .prettierignore
+.doc/

now.json

@@ -5,7 +5,7 @@
     {
       "src": "package.json",
       "use": "@now/static-build",
-      "config": { "distDir": "build" }
+      "config": { "distDir": ".doc" }
     }
   ]
 }

package.json

@@ -13,6 +13,7 @@
   "files": [
     "assets/*.css",
     "es",
+    "dist",
     "lib"
   ],
   "homepage": "http://github.com/react-component/mentions",
@@ -24,61 +25,39 @@
     "url": "http://github.com/react-component/mentions/issues"
   },
   "license": "MIT",
-  "config": {
-    "port": 8093
-  },
   "scripts": {
-    "build": "rc-tools run build",
-    "compile": "rc-tools run compile --babel-runtime",
-    "gh-pages": "rc-tools run gh-pages",
-    "start": "rc-tools run storybook",
-    "pub": "rc-tools run pub --babel-runtime",
-    "lint": "rc-tools run lint",
-    "lint:fix": "rc-tools run lint --fix",
-    "prettier": "rc-tools run prettier",
-    "test": "rc-tools run test",
-    "prepublish": "rc-tools run guard",
-    "init-tslint": "rc-tools run gen-lint-config",
-    "coverage": "rc-tools run test --coverage",
-    "pre-commit": "rc-tools run pre-commit",
-    "storybook": "rc-tools run storybook",
-    "lint-staged": "lint-staged",
+    "start": "father doc dev --storybook",
+    "build": "father doc build --storybook",
+    "compile": "father build",
+    "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish",
+    "lint": "eslint src/ --ext .tsx,.ts",
+    "test": "father test",
     "now-build": "npm run build"
   },
+  "peerDependencies": {
+    "react": "*"
+  },
   "devDependencies": {
     "@types/classnames": "^2.2.6",
     "@types/enzyme": "^3.1.15",
     "@types/react": "^16.7.17",
     "@types/react-dom": "^16.0.11",
     "@types/warning": "^3.0.0",
-    "enzyme": "^3.8.0",
-    "enzyme-adapter-react-16": "^1.7.1",
+    "@umijs/fabric": "^1.1.9",
     "enzyme-to-json": "^3.1.4",
-    "lint-staged": "^8.1.0",
+    "father": "^2.13.6",
     "lodash.debounce": "^4.0.8",
-    "pre-commit": "1.x",
-    "querystring": "^0.2.0",
-    "rc-tools": "^9.5.2",
+    "np": "^5.0.3",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "typescript": "^3.2.2"
   },
   "dependencies": {
     "@ant-design/create-react-context": "^0.2.4",
-    "babel-runtime": "^6.23.0",
     "classnames": "^2.2.6",
     "rc-menu": "^7.4.22",
     "rc-trigger": "^2.6.2",
     "rc-util": "^4.6.0",
     "react-lifecycles-compat": "^3.0.4"
-  },
-  "pre-commit": [
-    "lint-staged"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx}": [
-      "npm run pre-commit",
-      "git add"
-    ]
   }
 }

src/DropdownMenu.tsx

@@ -29,7 +29,7 @@ class DropdownMenu extends React.Component<DropdownMenuProps, {}> {
         activeKey={activeOption.value}
         onSelect={({ key }: { key: string }) => {
           const option = options.find(({ value }) => value === key);
-          selectOption(option!);
+          selectOption(option);
         }}
         onFocus={onFocus}
       >
@@ -50,7 +50,7 @@ class DropdownMenu extends React.Component<DropdownMenuProps, {}> {
           );
         })}
 
-        {!options.length && <MenuItem disabled={true}>{notFoundContent}</MenuItem>}
+        {!options.length && <MenuItem disabled>{notFoundContent}</MenuItem>}
       </Menu>
     );
   };

src/Mentions.tsx

@@ -77,7 +77,9 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
   }
 
   public textarea?: HTMLTextAreaElement;
+
   public measure?: HTMLDivElement;
+
   public focusId: number | undefined = undefined;
 
   constructor(props: MentionsProps) {
@@ -98,7 +100,7 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
 
     // Sync measure div top with textarea for rc-trigger usage
     if (measuring) {
-      this.measure!.scrollTop = this.textarea!.scrollTop;
+      this.measure.scrollTop = this.textarea.scrollTop;
     }
   }
 
@@ -138,7 +140,6 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
       event.preventDefault();
     } else if (which === KeyCode.ESC) {
       this.stopMeasure();
-      return;
     } else if (which === KeyCode.ENTER) {
       // Measure hit
       const option = this.getOptions()[activeIndex];
@@ -177,8 +178,8 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
 
     if (measureIndex !== -1) {
       const measureText = selectionStartText.slice(measureIndex + measurePrefix.length);
-      const validateMeasure: boolean = validateSearch!(measureText, this.props);
-      const matchOption: boolean = !!this.getOptions(measureText).length;
+      const validateMeasure: boolean = validateSearch(measureText, this.props);
+      const matchOption = !!this.getOptions(measureText).length;
 
       if (validateMeasure) {
         if (
@@ -247,13 +248,13 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
       measureLocation,
       targetText: mentionValue,
       prefix: measurePrefix,
-      selectionStart: this.textarea!.selectionStart,
-      split: split!,
+      selectionStart: this.textarea.selectionStart,
+      split,
     });
     this.triggerChange(text);
     this.stopMeasure(() => {
       // We need restore the selection position
-      setInputSelection(this.textarea!, selectionLocation);
+      setInputSelection(this.textarea, selectionLocation);
     });
 
     if (onSelect) {
@@ -285,7 +286,7 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
         if (filterOption === false) {
           return true;
         }
-        return filterOption!(targetMeasureText, option);
+        return filterOption(targetMeasureText, option);
       });
     return list;
   };
@@ -312,11 +313,11 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
   }
 
   public focus() {
-    this.textarea!.focus();
+    this.textarea.focus();
   }
 
   public blur() {
-    this.textarea!.blur();
+    this.textarea.blur();
   }
 
   public render() {
@@ -377,7 +378,7 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
                 transitionName={transitionName}
                 placement={placement}
                 options={options}
-                visible={true}
+                visible
               >
                 <span>{measurePrefix}</span>
               </KeywordTrigger>

src/MentionsContext.ts

@@ -12,9 +12,7 @@ export interface MentionsContextProps {
 }
 
 // We will never use default, here only to fix TypeScript warning
-const MentionsContext: Context<MentionsContextProps> = createReactContext(
-  {} as MentionsContextProps,
-);
+const MentionsContext: Context<MentionsContextProps> = createReactContext(null);
 
 export const MentionsContextProvider = MentionsContext.Provider;
 export const MentionsContextConsumer = MentionsContext.Consumer;

src/util.ts

@@ -3,7 +3,7 @@ import { OptionProps } from './Option';
 
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-type OmitFunc = <T extends object, K extends [...Array<keyof T>]>(
+type OmitFunc = <T extends object, K extends [...(keyof T)[]]>(
   obj: T,
   ...keys: K
 ) => { [K2 in Exclude<keyof T, K[number]>]: T[K2] };
@@ -23,7 +23,7 @@ export const omit: OmitFunc = (obj, ...keys) => {
  * Cut input selection into 2 part and return text before selection start
  */
 export function getBeforeSelectionText(input: HTMLTextAreaElement) {
-  const { selectionStart } = input as any;
+  const { selectionStart } = input;
   return input.value.slice(0, selectionStart);
 }
 

tests/shared/input.js

@@ -12,14 +12,16 @@ export function simulateInput(wrapper, text = '', keyEvent) {
   const textareaInstance = wrapper.find('textarea').instance();
   textareaInstance.value = text;
   textareaInstance.selectionStart = text.length;
-  textareaInstance.selectionStart = text.length;
 
   if (!keyEvent) {
     wrapper.find('textarea').simulate('change', {
       target: { value: text },
     });
   }
 
+  textareaInstance.selectionStart = text.length;
   wrapper.find('textarea').simulate('keyUp', myKeyEvent);
+
   wrapper.update();
 }
+/* eslint-enable */