diff --git a/__tests__/notifications.test.tsx b/__tests__/notifications.test.tsx
index 0befb997..e2669d28 100644
--- a/__tests__/notifications.test.tsx
+++ b/__tests__/notifications.test.tsx
@@ -1,4 +1,3 @@
-import { Button } from '@blueprintjs/core';
import { act, fireEvent, render, screen } from '@testing-library/react';
import React, { useContext } from 'react';
import { ReqoreNotificationsContext, ReqoreUIProvider } from '../src/index';
@@ -7,7 +6,7 @@ const AddButton = (props: any) => {
const { addNotification } = useContext(ReqoreNotificationsContext);
return (
-
+
);
};
@@ -28,7 +27,7 @@ const UpdateButton = (props: any) => {
const { addNotification } = useContext(ReqoreNotificationsContext);
return (
-
+
);
};
diff --git a/package.json b/package.json
index 368a7217..54ff7cbf 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
"react-dom": "^17.0.1"
},
"dependencies": {
- "@blueprintjs/core": "^3.36.0",
"@popperjs/core": "^2.6.0",
"@types/lodash": "^4.14.166",
"classnames": "^2.2.6",
diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx
index c290c331..454bb249 100644
--- a/src/components/Icon/index.tsx
+++ b/src/components/Icon/index.tsx
@@ -22,13 +22,13 @@ const StyledIconWrapper = styled.span<{ margin?: 'right' | 'left' }>`
${({ margin }) =>
margin &&
css`
- margin-${margin}: 5px;
+ margin-${margin}: 6px;
`}
`;
const ReqoreIcon = ({
icon,
- size = '16px',
+ size = '17px',
className,
color,
margin,
diff --git a/src/components/InternalPopover/index.tsx b/src/components/InternalPopover/index.tsx
index 738f7568..dfac4d61 100644
--- a/src/components/InternalPopover/index.tsx
+++ b/src/components/InternalPopover/index.tsx
@@ -63,14 +63,18 @@ const StyledPopoverWrapper = styled.div<{ theme: IReqoreTheme }>`
}
`;
-const StyledPopoverContent = styled.div`
+const StyledPopoverContent = styled.div<{ isString?: boolean }>`
width: 100%;
height: 100%;
- padding: 10px;
+ padding: ${({ isString }) => (isString ? '8px' : '5px')};
z-index: 20;
position: relative;
background-color: ${({ theme }) => theme.popover?.main || theme.main};
border-radius: 3.5px;
+
+ .reqore-popover-text {
+ font-size: 14px;
+ }
`;
export interface IReqoreInternalPopoverProps {
@@ -129,17 +133,19 @@ const InternalPopover: React.FC = ({
style={styles.arrow}
data-popper-arrow
/>
-
- {React.Children.map(content, (child) => {
- if (isString(child)) {
- return child;
- }
-
- return React.cloneElement(child, {
- _insidePopover: true,
- _popoverId: id,
- });
- })}
+
+ {isString(content) ? (
+ {content}
+ ) : (
+ <>
+ {React.Children.map(content, (child) => {
+ return React.cloneElement(child, {
+ _insidePopover: true,
+ _popoverId: id,
+ });
+ })}
+ >
+ )}
diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx
index 0a4759f0..1db96c73 100644
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -18,6 +18,18 @@ const StyledReqoreLayoutWrapper = styled.div<{
width: 100%;
height: 100%;
overflow: hidden;
+ font-size: 14px;
+
+ * {
+ font-family: 'Nunito Sans', -apple-system, '.SFNSText-Regular',
+ 'San Francisco', BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue',
+ Helvetica, Arial, sans-serif;
+ box-sizing: border-box;
+ }
+
+ a {
+ text-decoration: none;
+ }
${({ withSidebar, theme }) => css`
flex-flow: ${withSidebar ? 'row' : 'column'};
diff --git a/src/components/Sidebar/index.tsx b/src/components/Sidebar/index.tsx
index 7de5e191..ba5a8e08 100644
--- a/src/components/Sidebar/index.tsx
+++ b/src/components/Sidebar/index.tsx
@@ -77,6 +77,7 @@ const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>`
.sidebarScroll {
flex: 1;
}
+ transition: all 0.1s ease-in-out;
&.expanded {
min-width: 180px !important;
diff --git a/src/containers/UIProvider.tsx b/src/containers/UIProvider.tsx
index cadd59e3..1b19349b 100644
--- a/src/containers/UIProvider.tsx
+++ b/src/containers/UIProvider.tsx
@@ -26,13 +26,11 @@ const ReqoreUIProvider: React.FC = ({
return (
-
-
-
- {children}
-
-
-
+
+
+ {children}
+
+
);
};
diff --git a/src/index.tsx b/src/index.tsx
index 95083321..0ebc6d0f 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,3 @@
-import '@blueprintjs/core/lib/css/blueprint.css';
-
export { default as ReqoreBreadcrumbs } from './components/Breadcrumbs';
export { default as ReqoreBreadcrumbsItem } from './components/Breadcrumbs/item';
export { default as ReqoreContent } from './components/Content';
diff --git a/src/stories/Notifications/Interactive.stories.tsx b/src/stories/Notifications/Interactive.stories.tsx
index 8078328f..32a3c8da 100644
--- a/src/stories/Notifications/Interactive.stories.tsx
+++ b/src/stories/Notifications/Interactive.stories.tsx
@@ -1,4 +1,3 @@
-import { Button } from '@blueprintjs/core';
import { Meta, Story } from '@storybook/react/types-6-0';
import React, { useContext } from 'react';
import ReqoreNotification, {
@@ -16,7 +15,7 @@ const AddingButton = ({ id, onClick, onClose, onFinish }: any) => {
const { addNotification } = useContext(ReqoreNotificationsContext);
return (
-
+
);
};
@@ -39,7 +38,7 @@ const UpdatingButton = ({ id }) => {
const { addNotification } = useContext(ReqoreNotificationsContext);
return (
-
+
);
};
diff --git a/yarn.lock b/yarn.lock
index d9ebb4c6..51729e53 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1045,31 +1045,6 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-"@blueprintjs/core@^3.36.0":
- version "3.36.0"
- resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-3.36.0.tgz#0a271092050c17b84f29426594708180a1b5401a"
- integrity sha512-7VUyF+qWelDysajK0Xowlou+iqbGAFfGaM3znpmm7OEEIli5XRWjG9rhNuEk3sP7zbdOJpyqh5PAPDQvm5Sxmg==
- dependencies:
- "@blueprintjs/icons" "^3.23.0"
- "@types/dom4" "^2.0.1"
- classnames "^2.2"
- dom4 "^2.1.5"
- normalize.css "^8.0.1"
- popper.js "^1.16.1"
- react-lifecycles-compat "^3.0.4"
- react-popper "^1.3.7"
- react-transition-group "^2.9.0"
- resize-observer-polyfill "^1.5.1"
- tslib "~1.13.0"
-
-"@blueprintjs/icons@^3.23.0":
- version "3.23.0"
- resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-3.23.0.tgz#4cfe0db4363971ac5d8a0a59590a6efc16115dc6"
- integrity sha512-QOQ3P5bU1FiEwnMBl5Chn433ONSSTIMgC+zZJttyXV0m8R7D1bPBJJqIMuANXtRld/Fj+8IzoQ6jfaVUG16slA==
- dependencies:
- classnames "^2.2"
- tslib "~1.13.0"
-
"@cnakazawa/watch@^1.0.3":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
@@ -2284,11 +2259,6 @@
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
-"@types/dom4@^2.0.1":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@types/dom4/-/dom4-2.0.1.tgz#506d5781b9bcab81bd9a878b198aec7dee2a6033"
- integrity sha512-kSkVAvWmMZiCYtvqjqQEwOmvKwcH+V4uiv3qPQ8pAh1Xl39xggGEo8gHUqV4waYGHezdFw0rKBR8Jt0CrQSDZA==
-
"@types/glob-base@^0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@types/glob-base/-/glob-base-0.3.0.tgz#a581d688347e10e50dd7c17d6f2880a10354319d"
@@ -4250,7 +4220,7 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"
-classnames@^2.2, classnames@^2.2.5, classnames@^2.2.6:
+classnames@^2.2.5, classnames@^2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
@@ -4640,7 +4610,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-create-react-context@0.3.0, create-react-context@^0.3.0:
+create-react-context@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==
@@ -4888,18 +4858,6 @@ dedent@^0.7.0:
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
-deep-equal@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
- integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
- dependencies:
- is-arguments "^1.0.4"
- is-date-object "^1.0.1"
- is-regex "^1.0.4"
- object-is "^1.0.1"
- object-keys "^1.1.1"
- regexp.prototype.flags "^1.2.0"
-
deep-extend@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -5099,13 +5057,6 @@ dom-converter@^0.2:
dependencies:
utila "~0.4"
-dom-helpers@^3.4.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
- integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
- dependencies:
- "@babel/runtime" "^7.1.2"
-
dom-serializer@0:
version "0.2.2"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -5119,11 +5070,6 @@ dom-walk@^0.1.0:
resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
-dom4@^2.1.5:
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/dom4/-/dom4-2.1.6.tgz#c90df07134aa0dbd81ed4d6ba1237b36fc164770"
- integrity sha512-JkCVGnN4ofKGbjf5Uvc8mmxaATIErKQKSgACdBXpsQ3fY6DlIpAyWfiBSrGkttATssbDCp3psiAKWXk5gmjycA==
-
domain-browser@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -7291,7 +7237,7 @@ is-potential-custom-element-name@^1.0.0:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
-is-regex@^1.0.4, is-regex@^1.1.1:
+is-regex@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
@@ -8937,11 +8883,6 @@ normalize-url@^4.1.0:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
-normalize.css@^8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
- integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
-
npm-cli-login@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/npm-cli-login/-/npm-cli-login-0.1.1.tgz#12e5bebc753cf433a3edab75be1d76f696c6fb86"
@@ -9054,14 +8995,6 @@ object-inspect@^1.8.0, object-inspect@^1.9.0:
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
-object-is@^1.0.1:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
- integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
- dependencies:
- call-bind "^1.0.0"
- define-properties "^1.1.3"
-
object-keys@^1.0.12, object-keys@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -9608,11 +9541,6 @@ polished@^4.0.5:
dependencies:
"@babel/runtime" "^7.12.5"
-popper.js@^1.14.4, popper.js@^1.16.1:
- version "1.16.1"
- resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
- integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
-
posix-character-classes@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -10197,19 +10125,6 @@ react-popper-tooltip@^3.1.1:
"@popperjs/core" "^2.5.4"
react-popper "^2.2.4"
-react-popper@^1.3.7:
- version "1.3.7"
- resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324"
- integrity sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==
- dependencies:
- "@babel/runtime" "^7.1.2"
- create-react-context "^0.3.0"
- deep-equal "^1.1.1"
- popper.js "^1.14.4"
- prop-types "^15.6.1"
- typed-styles "^0.0.7"
- warning "^4.0.2"
-
react-popper@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.4.tgz#d2ad3d2474ac9f1abf93df3099d408e5aa6a2e22"
@@ -10280,16 +10195,6 @@ react-textarea-autosize@^8.1.1:
use-composed-ref "^1.0.0"
use-latest "^1.0.0"
-react-transition-group@^2.9.0:
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
- integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
- dependencies:
- dom-helpers "^3.4.0"
- loose-envify "^1.4.0"
- prop-types "^15.6.2"
- react-lifecycles-compat "^3.0.4"
-
react-universal-interface@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b"
@@ -10460,7 +10365,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
extend-shallow "^3.0.2"
safe-regex "^1.1.0"
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
+regexp.prototype.flags@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
@@ -12366,11 +12271,6 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
-tslib@~1.13.0:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
- integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
-
tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -12423,11 +12323,6 @@ type-is@~1.6.17, type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"
-typed-styles@^0.0.7:
- version "0.0.7"
- resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
- integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
-
typedarray-to-buffer@^3.1.5:
version "3.1.5"
resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"