From 6b09da8297049803bc651582970e93cc5c75d31a Mon Sep 17 00:00:00 2001 From: Carbon Copy Date: Wed, 30 Oct 2019 17:15:17 +1100 Subject: [PATCH] chore: defer plugins passing to props --- index.d.ts | 2 -- package-lock.json | 25 +++++++------------------ package.json | 2 +- src/Tippy.js | 3 +-- src/TippySingleton.js | 3 +-- src/hooks.js | 3 +-- src/util-hooks.js | 4 ++-- 7 files changed, 13 insertions(+), 29 deletions(-) diff --git a/index.d.ts b/index.d.ts index cf8b04a..91b1fd3 100644 --- a/index.d.ts +++ b/index.d.ts @@ -15,7 +15,6 @@ export interface TippyProps extends Omit, 'content'> { visible?: boolean; enabled?: boolean; className?: string; - plugins?: Plugin[]; singleton?: (instance: Instance) => void; [key: string]: any; } @@ -29,7 +28,6 @@ export interface TippySingletonProps extends Partial { children: Array>; enabled?: boolean; className?: string; - plugins?: Plugin[]; [key: string]: any; } diff --git a/package-lock.json b/package-lock.json index 18a6660..b89f92e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -334,17 +334,6 @@ "@babel/types": "^7.2.0" } }, - "@babel/helpers": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz", - "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==", - "dev": true, - "requires": { - "@babel/template": "^7.4.4", - "@babel/traverse": "^7.5.5", - "@babel/types": "^7.5.5" - } - }, "@babel/highlight": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", @@ -11207,9 +11196,9 @@ "dev": true }, "popper.js": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz", - "integrity": "sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==" + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz", + "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==" }, "posix-character-classes": { "version": "0.1.1", @@ -13989,11 +13978,11 @@ "dev": true }, "tippy.js": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-5.0.2.tgz", - "integrity": "sha512-Zj7ihX2/uImDudNkfxw9jgcbtg9sUKT3QRmuH9WJtKkX6M96SwMG8FPdiObholc4SJP6wlnqk0nqByjXb8QZSA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-5.1.0.tgz", + "integrity": "sha512-OHIF/a4tWOzhwSyuXR6ZuADYUHOohXQDXceONcRjLBUzEcdt2lAIqVeQflmCczkZ0Q4g1G5ihezx7kfL/lNylg==", "requires": { - "popper.js": "^1.15.0" + "popper.js": "^1.16.0" } }, "tmp": { diff --git a/package.json b/package.json index b3e3ba5..235cb16 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ }, "dependencies": { "prop-types": "^15.6.2", - "tippy.js": "^5.0.2" + "tippy.js": "^5.1.0" }, "peerDependencies": { "react": ">=16.8", diff --git a/src/Tippy.js b/src/Tippy.js index bd9da22..067c46c 100644 --- a/src/Tippy.js +++ b/src/Tippy.js @@ -13,7 +13,6 @@ export function Tippy({ children, content, className, - plugins, visible, singleton, enabled = true, @@ -54,7 +53,7 @@ export function Tippy({ // CREATE useIsomorphicLayoutEffect(() => { - const instance = tippy(component.ref, props, plugins); + const instance = tippy(component.ref, props); component.instance = instance; diff --git a/src/TippySingleton.js b/src/TippySingleton.js index 3f0e72e..b4b5173 100644 --- a/src/TippySingleton.js +++ b/src/TippySingleton.js @@ -10,7 +10,6 @@ import { export default function TippySingleton({ children, className, - plugins, enabled = true, ignoreAttributes = true, ...restOfNativeProps @@ -27,7 +26,7 @@ export default function TippySingleton({ const deps = [children.length]; - useSingletonCreate(component, props, plugins, enabled, deps); + useSingletonCreate(component, props, enabled, deps); useSingletonUpdate(component, props, enabled); useUpdateClassName(component, className, deps); diff --git a/src/hooks.js b/src/hooks.js index b367e3a..7031762 100644 --- a/src/hooks.js +++ b/src/hooks.js @@ -7,7 +7,6 @@ import { export function useSingleton({ className, - plugins, enabled = true, ignoreAttributes = true, ...restOfNativeProps @@ -25,7 +24,7 @@ export function useSingleton({ const deps = [component.instances.length]; - useSingletonCreate(component, props, plugins, enabled, deps); + useSingletonCreate(component, props, enabled, deps); useSingletonUpdate(component, props, enabled); useUpdateClassName(component, className, deps); diff --git a/src/util-hooks.js b/src/util-hooks.js index 7d8f132..6471610 100644 --- a/src/util-hooks.js +++ b/src/util-hooks.js @@ -31,10 +31,10 @@ export function useInstance(initialValue) { return ref.current; } -export function useSingletonCreate(component, props, plugins, enabled, deps) { +export function useSingletonCreate(component, props, enabled, deps) { useIsomorphicLayoutEffect(() => { const {instances} = component; - const instance = createSingleton(instances, props, plugins); + const instance = createSingleton(instances, props); component.instance = instance;