From 9e70664aeb350f45ef117590ef28747e608bfc96 Mon Sep 17 00:00:00 2001 From: Long Alan Date: Mon, 25 Nov 2019 13:34:03 +0800 Subject: [PATCH] fix: support horizontal scrolling in visual eidtor (#1607) * update fabric package * remove extra spacing * remove extra spacing --- .../extensions/obiformeditor/package.json | 2 +- .../extensions/visual-designer/package.json | 2 +- Composer/packages/lib/shared/package.json | 2 +- Composer/yarn.lock | 56 +++++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/Composer/packages/extensions/obiformeditor/package.json b/Composer/packages/extensions/obiformeditor/package.json index 419e102656..9366a3c15e 100644 --- a/Composer/packages/extensions/obiformeditor/package.json +++ b/Composer/packages/extensions/obiformeditor/package.json @@ -34,7 +34,7 @@ "format-message": "^6.2.1", "lodash": "^4.17.15", "nanoid": "^2.0.1", - "office-ui-fabric-react": "7.37.1", + "office-ui-fabric-react": "7.62.0", "react-error-boundary": "^1.2.5" }, "peerDependencies": { diff --git a/Composer/packages/extensions/visual-designer/package.json b/Composer/packages/extensions/visual-designer/package.json index 5fbdf33761..c39739966f 100644 --- a/Composer/packages/extensions/visual-designer/package.json +++ b/Composer/packages/extensions/visual-designer/package.json @@ -31,7 +31,7 @@ "dagre-d3": "^0.6.3", "format-message": "^6.2.1", "lodash": "^4.17.15", - "office-ui-fabric-react": "7.37.1", + "office-ui-fabric-react": "7.62.0", "prop-types": "^15.7.2", "source-map-loader": "^0.2.4" }, diff --git a/Composer/packages/lib/shared/package.json b/Composer/packages/lib/shared/package.json index 6cabe2c1d3..bb5cff12ed 100644 --- a/Composer/packages/lib/shared/package.json +++ b/Composer/packages/lib/shared/package.json @@ -36,7 +36,7 @@ "copyfiles": "^2.1.0", "jest": "24.0.0", "jest-dom": "^3.1.3", - "office-ui-fabric-react": "7.37.1", + "office-ui-fabric-react": "7.62.0", "react": "16.9.0", "react-dom": "16.9.0", "react-testing-library": "^6.0.2", diff --git a/Composer/yarn.lock b/Composer/yarn.lock index fc01994dec..dad6e50189 100644 --- a/Composer/yarn.lock +++ b/Composer/yarn.lock @@ -3075,6 +3075,17 @@ "@uifabric/utilities" "^7.0.9" tslib "^1.7.1" +"@uifabric/foundation@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@uifabric/foundation/-/foundation-7.5.0.tgz#d36f15ef59edeaa8219f2b7d34f74c6d756f6622" + integrity sha512-eymMyV3e+MFCkcfC1AFIAzVP/h6/QvDcYb1l6K3IaG1QG47ZwijJJXseEvNDjimfUiJhez9H7cSsRZPIIJ5MaQ== + dependencies: + "@uifabric/merge-styles" "^7.8.0" + "@uifabric/set-version" "^7.0.2" + "@uifabric/styling" "^7.7.2" + "@uifabric/utilities" "^7.5.0" + tslib "^1.7.1" + "@uifabric/icons@^7.2.1": version "7.2.1" resolved "https://registry.yarnpkg.com/@uifabric/icons/-/icons-7.2.1.tgz#b41f52c3c8443d66c2947f3a0368a8e45f469f9f" @@ -3109,6 +3120,14 @@ "@uifabric/set-version" "^7.0.2" tslib "^1.7.1" +"@uifabric/merge-styles@^7.8.0", "@uifabric/merge-styles@^7.8.1": + version "7.8.1" + resolved "https://registry.yarnpkg.com/@uifabric/merge-styles/-/merge-styles-7.8.1.tgz#b3973eb6942bf5fd1653fb8c2ae349343bacd30d" + integrity sha512-DJBXNsYfrYQ3wCjOE197JqXTkqwfPlGJhQkhYMBwO76ovKBQyJxT8m6NL8og5F9blnIBdCJPrvRUz/21/WlUGg== + dependencies: + "@uifabric/set-version" "^7.0.2" + tslib "^1.7.1" + "@uifabric/react-hooks@^7.0.1": version "7.0.1" resolved "https://registry.yarnpkg.com/@uifabric/react-hooks/-/react-hooks-7.0.1.tgz#aa0e9f17e13def6763de7671bd82210261222591" @@ -3147,6 +3166,17 @@ "@uifabric/utilities" "^7.0.9" tslib "^1.7.1" +"@uifabric/styling@^7.7.2", "@uifabric/styling@^7.7.3": + version "7.7.3" + resolved "https://registry.yarnpkg.com/@uifabric/styling/-/styling-7.7.3.tgz#593dd308dbf4425c1baa9678a553c8494d884448" + integrity sha512-peAAXEfqIXHD1a4GnAA5hs4rv/jgevN2EwJKdlmGv0ecK9kaXl/sgEQEcniV0iBlJffy2OnWRdi8YlZygUxFmA== + dependencies: + "@microsoft/load-themed-styles" "^1.7.13" + "@uifabric/merge-styles" "^7.8.1" + "@uifabric/set-version" "^7.0.2" + "@uifabric/utilities" "^7.5.0" + tslib "^1.7.1" + "@uifabric/utilities@^7.0.10", "@uifabric/utilities@^7.0.9": version "7.0.10" resolved "https://registry.yarnpkg.com/@uifabric/utilities/-/utilities-7.0.10.tgz#cadbc6689c417ec01afc029a2894027bd80215dc" @@ -3167,6 +3197,16 @@ prop-types "^15.5.10" tslib "^1.7.1" +"@uifabric/utilities@^7.5.0", "@uifabric/utilities@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@uifabric/utilities/-/utilities-7.6.0.tgz#e0a7be2969792f7ef15907744e72bdebbf5ff024" + integrity sha512-umIN2M4Ue1FjqmRv2JVvzXljA/eG5QwoyNi8u2BVfJKXSi2qZ82ey3btV4lCdL2kUo25oXRM1qvaK7416Stdrg== + dependencies: + "@uifabric/merge-styles" "^7.8.1" + "@uifabric/set-version" "^7.0.2" + prop-types "^15.5.10" + tslib "^1.7.1" + "@uifabric/variants@^7.0.5": version "7.0.5" resolved "https://registry.yarnpkg.com/@uifabric/variants/-/variants-7.0.5.tgz#67a5301a8c36bcb2e46c7d86929d58184e37cc2d" @@ -11928,6 +11968,22 @@ office-ui-fabric-react@7.37.1: prop-types "^15.5.10" tslib "^1.7.1" +office-ui-fabric-react@7.62.0: + version "7.62.0" + resolved "https://registry.yarnpkg.com/office-ui-fabric-react/-/office-ui-fabric-react-7.62.0.tgz#3260eaf43d5bfbdefc53fc9ade0470dc51b37412" + integrity sha512-d3UoiBIAdjQeVgxOXCTg97cS8RfasXg5xXgbZBYPv8xv7HxsZ1zabsVqXMl+5TA/vX7rb9hSn6JMscaVWwWaUA== + dependencies: + "@microsoft/load-themed-styles" "^1.7.13" + "@uifabric/foundation" "^7.5.0" + "@uifabric/icons" "^7.3.0" + "@uifabric/merge-styles" "^7.8.1" + "@uifabric/react-hooks" "^7.0.1" + "@uifabric/set-version" "^7.0.2" + "@uifabric/styling" "^7.7.3" + "@uifabric/utilities" "^7.6.0" + prop-types "^15.5.10" + tslib "^1.7.1" + office-ui-fabric-react@^7.29.2: version "7.35.0" resolved "https://registry.yarnpkg.com/office-ui-fabric-react/-/office-ui-fabric-react-7.35.0.tgz#7132cf94bffcf9a9da310bff0e48f63717ae00d9"