Merge pull request #14069 from storybookjs/react-sizeme

Move back to the original react-sizeme package

addons/a11y/package.json

@@ -41,7 +41,6 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@hypnosphi/react-sizeme": "^2.6.13",
     "@storybook/addons": "6.2.0-beta.4",
     "@storybook/api": "6.2.0-beta.4",
     "@storybook/channels": "6.2.0-beta.4",
@@ -54,6 +53,7 @@
     "core-js": "^3.8.2",
     "global": "^4.4.0",
     "lodash": "^4.17.20",
+    "react-sizeme": "^3.0.1",
     "regenerator-runtime": "^0.13.7",
     "ts-dedent": "^2.0.0",
     "util-deprecate": "^1.0.2"

addons/a11y/src/components/Report/Rules.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent } from 'react';
 import { styled } from '@storybook/theming';
 import { Badge } from '@storybook/components';
 import { CheckResult } from 'axe-core';
-import { SizeMe } from '@hypnosphi/react-sizeme';
+import { SizeMe } from 'react-sizeme';
 
 const List = styled.div({
   display: 'flex',

addons/a11y/src/components/Tabs.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { styled } from '@storybook/theming';
 import { NodeResult, Result } from 'axe-core';
-import { SizeMe } from '@hypnosphi/react-sizeme';
+import { SizeMe } from 'react-sizeme';
 import HighlightToggle from './Report/HighlightToggle';
 import { RuleType } from './A11YPanel';
 import { useA11yContext } from './A11yContext';

addons/jest/package.json

@@ -43,14 +43,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@hypnosphi/react-sizeme": "^2.6.13",
     "@storybook/addons": "6.2.0-beta.4",
     "@storybook/api": "6.2.0-beta.4",
     "@storybook/components": "6.2.0-beta.4",
     "@storybook/core-events": "6.2.0-beta.4",
     "@storybook/theming": "6.2.0-beta.4",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
+    "react-sizeme": "^3.0.1",
     "regenerator-runtime": "^0.13.7",
     "upath": "^1.2.0"
   },

addons/jest/src/components/Panel.tsx

@@ -2,7 +2,7 @@
 import React, { Fragment } from 'react';
 import { styled, themes, convert } from '@storybook/theming';
 import { ScrollArea, TabsState, Link, Placeholder } from '@storybook/components';
-import { SizeMe } from '@hypnosphi/react-sizeme';
+import { SizeMe } from 'react-sizeme';
 import Result from './Result';
 import provideJestResult, { Test } from '../hoc/provideJestResult';
 

lib/ui/package.json

@@ -37,7 +37,6 @@
   },
   "dependencies": {
     "@emotion/core": "^10.1.1",
-    "@hypnosphi/react-sizeme": "^2.6.13",
     "@storybook/addons": "6.2.0-beta.4",
     "@storybook/api": "6.2.0-beta.4",
     "@storybook/channels": "6.2.0-beta.4",
@@ -62,6 +61,7 @@
     "qs": "^6.9.5",
     "react-draggable": "^4.4.3",
     "react-helmet-async": "^1.0.7",
+    "react-sizeme": "^3.0.1",
     "regenerator-runtime": "^0.13.7",
     "resolve-from": "^5.0.0",
     "store2": "^2.12.0"

lib/ui/src/app.tsx

@@ -1,5 +1,5 @@
 import React, { FunctionComponent, useMemo } from 'react';
-import sizeMe from '@hypnosphi/react-sizeme';
+import sizeMe from 'react-sizeme';
 
 import { State } from '@storybook/api';
 import { Symbols } from '@storybook/components';

yarn.lock

@@ -2834,16 +2834,6 @@
     temp "^0.8.1"
     write-file-atomic "^2.3.0"
 
-"@hypnosphi/react-sizeme@^2.6.13":
-  version "2.6.13"
-  resolved "https://registry.yarnpkg.com/@hypnosphi/react-sizeme/-/react-sizeme-2.6.13.tgz#81b7bf40b27adcb48b804fb8c725f63962e9a7d9"
-  integrity sha512-6PJJeYPiGacebN7Tm7k2EJTgMYeTQ2xnY5e0Otwx5Qq5AjnjErHuA2s9Yb9wS9ns7J2Eu+IwkNBvdJoVxweqkw==
-  dependencies:
-    element-resize-detector "^1.2.1"
-    invariant "^2.2.4"
-    shallowequal "^1.1.0"
-    throttle-debounce "^2.1.0"
-
 "@iarna/toml@^2.2.0":
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
@@ -13508,10 +13498,10 @@ elegant-spinner@^1.0.1:
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
-element-resize-detector@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.1.tgz#b0305194447a4863155e58f13323a0aef30851d1"
-  integrity sha512-BdFsPepnQr9fznNPF9nF4vQ457U/ZJXQDSNF1zBe7yaga8v9AdZf3/NElYxFdUh7SitSGt040QygiTo6dtatIw==
+element-resize-detector@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.2.tgz#bf7c3ff915957e4e62e86241ed2f9c86b078892b"
+  integrity sha512-+LOXRkCJc4I5WhEJxIDjhmE3raF8jtOMBDqSCgZTMz2TX3oXAX5pE2+MDeopJlGdXzP7KzPbBJaUGfNaP9HG4A==
   dependencies:
     batch-processor "1.0.0"
 
@@ -28037,6 +28027,16 @@ react-shallow-renderer@^16.13.1:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0"
 
+react-sizeme@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-3.0.1.tgz#4d12f4244e0e6a0fb97253e7af0314dc7c83a5a0"
+  integrity sha512-9Hf1NLgSbny1bha77l9HwvwwxQUJxFUqi44Ih+y3evA+PezBpGdCGlnvye6avss2cIgs9PgdYgMnfuzJWn/RUw==
+  dependencies:
+    element-resize-detector "^1.2.2"
+    invariant "^2.2.4"
+    shallowequal "^1.1.0"
+    throttle-debounce "^3.0.1"
+
 react-syntax-highlighter@^13.5.3:
   version "13.5.3"
   resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
@@ -32012,10 +32012,10 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-throttle-debounce@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.3.0.tgz#fd31865e66502071e411817e241465b3e9c372e2"
-  integrity sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==
+throttle-debounce@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
+  integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
 
 throttleit@^1.0.0:
   version "1.0.0"