diff --git a/packages/drawing-toolbar/package-lock.json b/packages/drawing-toolbar/package-lock.json index b6a6399f..a07acf5f 100644 --- a/packages/drawing-toolbar/package-lock.json +++ b/packages/drawing-toolbar/package-lock.json @@ -2442,9 +2442,9 @@ "peer": true }, "node_modules/@ulms/ui-drawing": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@ulms/ui-drawing/-/ui-drawing-3.3.8.tgz", - "integrity": "sha512-9/r483MmDL/vsJIwy+bc4GpX6fhuvrUiXXO7S7spCX6bCr9PnBdEAayJ1pFxjREjJffyIx3qnwcIGV/L/AluiQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@ulms/ui-drawing/-/ui-drawing-3.4.0.tgz", + "integrity": "sha512-+91lg9RWWkleWe0vExXt5BrVSHJUOWeXXndob+spR3lBfL0nBofFalyTaoJpUEb89wtFFC/2/EPUpBbV3DjXGw==", "peer": true, "dependencies": { "classnames-es": "^2.2.6", @@ -2453,7 +2453,7 @@ }, "peerDependencies": { "fabric": "^5.3.0", - "react": "^15.6 || ^16.x || ^17.x" + "react": "^16.14" } }, "node_modules/abab": { @@ -6680,9 +6680,9 @@ "peer": true }, "@ulms/ui-drawing": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@ulms/ui-drawing/-/ui-drawing-3.3.8.tgz", - "integrity": "sha512-9/r483MmDL/vsJIwy+bc4GpX6fhuvrUiXXO7S7spCX6bCr9PnBdEAayJ1pFxjREjJffyIx3qnwcIGV/L/AluiQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@ulms/ui-drawing/-/ui-drawing-3.4.0.tgz", + "integrity": "sha512-+91lg9RWWkleWe0vExXt5BrVSHJUOWeXXndob+spR3lBfL0nBofFalyTaoJpUEb89wtFFC/2/EPUpBbV3DjXGw==", "peer": true, "requires": { "classnames-es": "^2.2.6", diff --git a/packages/drawing-toolbar/src/components/line-settings.jsx b/packages/drawing-toolbar/src/components/line-settings.jsx index 1269f012..38550204 100644 --- a/packages/drawing-toolbar/src/components/line-settings.jsx +++ b/packages/drawing-toolbar/src/components/line-settings.jsx @@ -18,7 +18,6 @@ const lineSizes = { EIGHT: 8, } - export const LineSettings = ({ currentSize, handleClick, dashed = false, }) => { diff --git a/packages/tooltip/package-lock.json b/packages/tooltip/package-lock.json index 6720c1ae..39cb32ae 100644 --- a/packages/tooltip/package-lock.json +++ b/packages/tooltip/package-lock.json @@ -1,18 +1,19 @@ { "name": "@ulms/tooltip", - "version": "1.0.0", + "version": "1.0.1-dev-1-ULMS-2928", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ulms/tooltip", - "version": "1.0.0", + "version": "1.0.1-dev-1-ULMS-2928", "license": "MIT", "devDependencies": { "react": "^16.14 || 17 || 18" }, "peerDependencies": { "@foxford/ui": "^2.17.0", + "lodash": "~4.17.21", "react": "^16.14 || 17 || 18", "react-dom": "^16.14 || 17 || 18", "styled-components": "^5.0.0" diff --git a/packages/tooltip/package.json b/packages/tooltip/package.json index 6a09e239..40fa10bc 100644 --- a/packages/tooltip/package.json +++ b/packages/tooltip/package.json @@ -1,6 +1,6 @@ { "name": "@ulms/tooltip", - "version": "1.0.0", + "version": "1.0.1-dev-1-ULMS-2928", "description": "", "keywords": [ "lerna" @@ -29,6 +29,7 @@ }, "peerDependencies": { "@foxford/ui": "^2.17.0", + "lodash": "~4.17.21", "react": "^16.14 || 17 || 18", "react-dom": "^16.14 || 17 || 18", "styled-components": "^5.0.0" diff --git a/packages/tooltip/src/tooltip.jsx b/packages/tooltip/src/tooltip.jsx index 0e7e9658..6db36cf0 100644 --- a/packages/tooltip/src/tooltip.jsx +++ b/packages/tooltip/src/tooltip.jsx @@ -1,4 +1,5 @@ /* eslint-disable react/jsx-props-no-spreading */ +import merge from 'lodash/merge' import React, { memo, useMemo } from 'react' import styled from 'styled-components' import { Tooltip as TooltipComponent } from '@foxford/ui' @@ -25,6 +26,8 @@ const styles = { fontSize: '14px', lineHeight: '130%', color: '#333', + textAlign: 'center', + whiteSpace: 'pre-line', }, arrow: { spread: 16, @@ -69,7 +72,10 @@ function _Tooltip ({ dark, ...tooltipProps }) { - const computedStyles = useMemo(() => dark ? darkStyles : styles, [dark, customStyles]) + const computedStyles = useMemo( + () => merge({}, dark ? darkStyles : styles, customStyles), + [dark, customStyles] + ) return disabled || hideTooltip ? (