refactor: update scheduler (#465)

* refactor(@uform/core): update onFormSubmit position

* fix(@uform/shared): fix shared

* refactor(@uform/react): remove react scheduler deps

* refactor(@uform/core): move scheduler

Author: janryWang

packages/core/src/index.ts

@@ -9,7 +9,8 @@ import {
   FormPath,
   FormPathPattern,
   each,
-  isObj
+  isObj,
+  scheduler
 } from '@uform/shared'
 import {
   FormValidator,
@@ -19,7 +20,6 @@ import {
 } from '@uform/validator'
 import { FormHeart } from './shared/lifecycle'
 import { FormGraph } from './shared/graph'
-import { scheduler } from './shared/scheduler'
 import { FormState } from './state/form'
 import { VirtualFieldState } from './state/virtual-field'
 import { FieldState } from './state/field'

packages/react/package.json

@@ -27,8 +27,7 @@
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "react-eva": "^1.0.0-alpha.0",
-    "rxjs": "^6.5.1",
-    "scheduler": ">=0.11.2"
+    "rxjs": "^6.5.1"
   },
   "dependencies": {
     "@uform/core": "^1.0.0-alpha.6",

packages/react/src/shared.ts

@@ -1,4 +1,4 @@
-import { isFn, FormPath, globalThisPolyfill, Subscribable } from '@uform/shared'
+import { isFn, FormPath, Subscribable } from '@uform/shared'
 import { IFormEffect, IFormActions, IFormAsyncActions } from './types'
 import { Observable } from 'rxjs/internal/Observable'
 import { filter } from 'rxjs/internal/operators/filter'
@@ -124,30 +124,6 @@ export const getValueFromEvent = (event: any) => {
   return event
 }
 
-const compactScheduler = ([raf, caf, priority], fresh: boolean) => {
-  return [fresh ? callback => raf(priority, callback) : raf, caf]
-}
-
-const getScheduler = () => {
-  if (!globalThisPolyfill.requestAnimationFrame) {
-    return [globalThisPolyfill.setTimeout, globalThisPolyfill.clearTimeout]
-  }
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const scheduler = require('scheduler') as any
-    return compactScheduler(
-      [
-        scheduler.scheduleCallback || scheduler.unstable_scheduleCallback,
-        scheduler.cancelCallback || scheduler.unstable_cancelCallback,
-        scheduler.NormalPriority || scheduler.unstable_NormalPriority
-      ],
-      !!scheduler.unstable_requestPaint
-    )
-  } catch (err) {
-    return [self.requestAnimationFrame, self.cancelAnimationFrame]
-  }
-}
-
 export class Broadcast extends Subscribable {
   context: any
 
@@ -166,8 +142,6 @@ export const env = {
   currentActions: null
 }
 
-export const [raf, caf] = getScheduler()
-
 export const createFormEffects = <Payload = any, Actions = any>(
   effects: IFormEffect<Payload, Actions> | null,
   actions: Actions

packages/shared/src/clone.ts

@@ -1,5 +1,5 @@
 import { isFn } from './types'
-import { globalThisPolyfill } from './global'
+import { instOf } from './instanceof'
 
 type Filter = (value: any, key: string) => boolean
 
@@ -24,17 +24,11 @@ const isNativeObject = (values: any): any => {
   for (let i = 0; i < NATIVE_KEYS.length; i++) {
     const item = NATIVE_KEYS[i]
     if (Array.isArray(item) && item[0]) {
-      if (
-        globalThisPolyfill[item[0] as string] &&
-        values instanceof globalThisPolyfill[item[0] as string]
-      ) {
+      if (instOf(values, item[0])) {
         return item[1] ? item[1] : item[0]
       }
     } else {
-      if (
-        globalThisPolyfill[item as string] &&
-        values instanceof globalThisPolyfill[item as string]
-      ) {
+      if (instOf(values, item)) {
         return item
       }
     }

packages/shared/src/compare.ts

@@ -1,4 +1,5 @@
 import { isFn, isArr } from './types'
+import { instOf } from './instanceof'
 const isArray = isArr
 const keyList = Object.keys
 const hasProp = Object.prototype.hasOwnProperty
@@ -44,8 +45,8 @@ function equal(a: any, b: any, filter?: Filter) {
     const immutableB = b && b.toJS
     if (immutableA !== immutableB) return false
     if (immutableA) return a.is ? a.is(b) : a === b
-    const dateA = a instanceof Date
-    const dateB = b instanceof Date
+    const dateA = instOf(a, 'Date')
+    const dateB = instOf(b, 'Date')
     if (dateA !== dateB) {
       return false
     }
@@ -56,21 +57,18 @@ function equal(a: any, b: any, filter?: Filter) {
     const schemaB = b && b.toJSON
     if (schemaA !== schemaB) return false
     if (schemaA && schemaB) return equal(a.toJSON(), b.toJSON(), filter)
-    const regexpA = a instanceof RegExp
-    const regexpB = b instanceof RegExp
+    const regexpA = instOf(a, 'RegExp')
+    const regexpB = instOf(b, 'RegExp')
     if (regexpA !== regexpB) {
       return false
     }
     if (regexpA && regexpB) {
       return a.toString() === b.toString()
     }
-    // fix: Not in the browser
-    if(typeof URL !== void(0)){
-      const urlA = a instanceof URL
-      const urlB = b instanceof URL
-      if (urlA && urlB) {
-        return a.href === b.href
-      }
+    const urlA = instOf(a, 'URL')
+    const urlB = instOf(b, 'URL')
+    if (urlA && urlB) {
+      return a.href === b.href
     }
 
     const keys = keyList(a)

packages/shared/src/index.ts

@@ -10,3 +10,5 @@ export * from './path'
 export * from './deprecate'
 export * from './subscribable'
 export * from './merge'
+export * from './instanceof'
+export * from './scheduler'

packages/shared/src/instanceof.ts

@@ -0,0 +1,10 @@
+import { globalThisPolyfill } from './global'
+import { isStr, isFn } from './types'
+export const instOf = (value: any, cls: any) => {
+  if (isFn(cls)) return value instanceof cls
+  if (isStr(cls))
+    return globalThisPolyfill[cls]
+      ? value instanceof globalThisPolyfill[cls]
+      : false
+  return false
+}

packages/shared/src/isEmpty.ts

@@ -1,3 +1,4 @@
+import { instOf } from './instanceof'
 const has = Object.prototype.hasOwnProperty
 
 const toString = Object.prototype.toString
@@ -49,7 +50,7 @@ export function isEmpty(val: any): boolean {
   }
 
   // Errors...
-  if (val instanceof Error) {
+  if (instOf(val, 'Error')) {
     return val.message === ''
   }
 

packages/core/src/shared/scheduler.ts packages/shared/src/scheduler.ts

@@ -1,4 +1,4 @@
-import { isFn } from '@uform/shared'
+import { isFn } from './types'
 
 export const scheduler = (concurrent = 360) => {
   let operating = false