diff --git a/apps/fabric-website-resources/package.json b/apps/fabric-website-resources/package.json index de062cf9c49eb..7edf97f8bf8a0 100644 --- a/apps/fabric-website-resources/package.json +++ b/apps/fabric-website-resources/package.json @@ -64,7 +64,6 @@ "@uifabric/example-app-base": "^6.23.1", "@uifabric/fluent-theme": "^0.16.10", "@uifabric/icons": "^6.5.2", - "@uifabric/legacy": "^6.164.5", "@uifabric/merge-styles": "^6.17.4", "@uifabric/set-version": "^1.1.3", "@uifabric/styling": "^6.47.6", diff --git a/apps/fabric-website-resources/src/ComponentStatus/AllComponents.checklist.ts b/apps/fabric-website-resources/src/ComponentStatus/AllComponents.checklist.ts index a012fa816d7f2..9fc831104750b 100644 --- a/apps/fabric-website-resources/src/ComponentStatus/AllComponents.checklist.ts +++ b/apps/fabric-website-resources/src/ComponentStatus/AllComponents.checklist.ts @@ -30,7 +30,7 @@ export const AllComponentsStatus: IComponentStatusState = { List: require('office-ui-fabric-react/lib/components/List/List.checklist').ListStatus, MessageBar: require('office-ui-fabric-react/lib/components/MessageBar/MessageBar.checklist').MessageBarStatus, Modal: require('office-ui-fabric-react/lib/components/Modal/Modal.checklist').ModalStatus, - Nav: require('@uifabric/legacy/lib/components/Nav/Nav.checklist').NavStatus, + Nav: require('office-ui-fabric-react/lib/components/Nav/Nav.checklist').NavStatus, Overlay: require('office-ui-fabric-react/lib/components/Overlay/Overlay.checklist').OverlayStatus, OverflowSet: require('office-ui-fabric-react/lib/components/OverflowSet/OverflowSet.checklist').OverflowSetStatus, Panel: require('office-ui-fabric-react/lib/components/Panel/Panel.checklist').PanelStatus, diff --git a/apps/fabric-website-resources/src/components/pages/CalendarPage.tsx b/apps/fabric-website-resources/src/components/pages/CalendarPage.tsx index 6947253119c9f..ac55f0b6a75fd 100644 --- a/apps/fabric-website-resources/src/components/pages/CalendarPage.tsx +++ b/apps/fabric-website-resources/src/components/pages/CalendarPage.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { CalendarPageProps } from '@uifabric/legacy/lib/components/Calendar/Calendar.doc'; +import { CalendarPageProps } from 'office-ui-fabric-react/lib/components/Calendar/Calendar.doc'; import { DemoPage } from '../DemoPage'; export const CalendarPage = (props: { isHeaderVisible: boolean }) => ( diff --git a/apps/fabric-website-resources/src/components/pages/DatePickerPage.tsx b/apps/fabric-website-resources/src/components/pages/DatePickerPage.tsx index 36a88353b04a7..2f89d7ac2dc12 100644 --- a/apps/fabric-website-resources/src/components/pages/DatePickerPage.tsx +++ b/apps/fabric-website-resources/src/components/pages/DatePickerPage.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { DemoPage } from '../DemoPage'; -import { DatePickerPageProps } from '@uifabric/legacy/lib/components/DatePicker/DatePicker.doc'; +import { DatePickerPageProps } from 'office-ui-fabric-react/lib/components/DatePicker/DatePicker.doc'; export const DatePickerPage = (props: { isHeaderVisible: boolean }) => ( ( diff --git a/apps/fabric-website-resources/webpack.config.js b/apps/fabric-website-resources/webpack.config.js index 292412661590d..d2446bba09561 100644 --- a/apps/fabric-website-resources/webpack.config.js +++ b/apps/fabric-website-resources/webpack.config.js @@ -24,9 +24,6 @@ module.exports = [ resolve: { alias: { - '@uifabric/legacy$': path.resolve(__dirname, '../../packages/legacy/lib'), - '@uifabric/legacy/src': path.resolve(__dirname, '../../packages/legacy/src'), - '@uifabric/legacy/lib': path.resolve(__dirname, '../../packages/legacy/lib'), 'office-ui-fabric-react$': path.resolve(__dirname, '../../packages/office-ui-fabric-react/lib'), 'office-ui-fabric-react/src': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'), 'office-ui-fabric-react/lib': path.resolve(__dirname, '../../packages/office-ui-fabric-react/lib'), diff --git a/apps/fabric-website-resources/webpack.serve.config.js b/apps/fabric-website-resources/webpack.serve.config.js index f0a5122d1781c..e645ab5de80bb 100644 --- a/apps/fabric-website-resources/webpack.serve.config.js +++ b/apps/fabric-website-resources/webpack.serve.config.js @@ -15,9 +15,6 @@ module.exports = resources.createServeConfig({ resolve: { alias: { - '@uifabric/legacy$': path.resolve(__dirname, '../../packages/legacy/src'), - '@uifabric/legacy/src': path.resolve(__dirname, '../../packages/legacy/src'), - '@uifabric/legacy/lib': path.resolve(__dirname, '../../packages/legacy/src'), 'office-ui-fabric-react$': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'), 'office-ui-fabric-react/src': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'), 'office-ui-fabric-react/lib': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'), diff --git a/apps/fabric-website/package.json b/apps/fabric-website/package.json index 168763acae88f..619e9d448385b 100644 --- a/apps/fabric-website/package.json +++ b/apps/fabric-website/package.json @@ -51,7 +51,6 @@ "@uifabric/file-type-icons": "^6.4.10", "@uifabric/fluent-theme": "^0.16.10", "@uifabric/icons": "^6.5.2", - "@uifabric/legacy": "^6.164.5", "@uifabric/set-version": "^1.1.3", "@uifabric/theme-samples": "^0.1.6", "react-app-polyfill": "~1.0.1", diff --git a/apps/fabric-website/src/pages/Controls/CalendarPage/CalendarPage.doc.ts b/apps/fabric-website/src/pages/Controls/CalendarPage/CalendarPage.doc.ts index 01436dfb90ce8..33b81b82650da 100644 --- a/apps/fabric-website/src/pages/Controls/CalendarPage/CalendarPage.doc.ts +++ b/apps/fabric-website/src/pages/Controls/CalendarPage/CalendarPage.doc.ts @@ -1,5 +1,5 @@ import { TFabricPlatformPageProps } from '../../../interfaces/Platforms'; -import { CalendarPageProps as ExternalProps } from '@uifabric/legacy/lib/components/Calendar/Calendar.doc'; +import { CalendarPageProps as ExternalProps } from 'office-ui-fabric-react/lib/components/Calendar/Calendar.doc'; const related = require('!raw-loader!@uifabric/fabric-website/src/pages/Controls/CalendarPage/docs/CalendarRelated.md') as string; const componentUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/apps/fabric-website/src/pages/Controls/CalendarPage'; diff --git a/apps/fabric-website/src/pages/Controls/DatePickerPage/DatePickerPage.doc.ts b/apps/fabric-website/src/pages/Controls/DatePickerPage/DatePickerPage.doc.ts index 7584257a13455..6771b43732be5 100644 --- a/apps/fabric-website/src/pages/Controls/DatePickerPage/DatePickerPage.doc.ts +++ b/apps/fabric-website/src/pages/Controls/DatePickerPage/DatePickerPage.doc.ts @@ -1,5 +1,5 @@ import { TFabricPlatformPageProps } from '../../../interfaces/Platforms'; -import { DatePickerPageProps as ExternalProps } from '@uifabric/legacy/lib/components/DatePicker/DatePicker.doc'; +import { DatePickerPageProps as ExternalProps } from 'office-ui-fabric-react/lib/components/DatePicker/DatePicker.doc'; const related = require('!raw-loader!@uifabric/fabric-website/src/pages/Controls/DatePickerPage/docs/DatePickerRelated.md') as string; const componentUrl = diff --git a/apps/fabric-website/src/pages/Controls/NavPage/NavPage.doc.ts b/apps/fabric-website/src/pages/Controls/NavPage/NavPage.doc.ts index 3b12603d4f2dc..bd2d124b039c9 100644 --- a/apps/fabric-website/src/pages/Controls/NavPage/NavPage.doc.ts +++ b/apps/fabric-website/src/pages/Controls/NavPage/NavPage.doc.ts @@ -1,5 +1,5 @@ import { TFabricPlatformPageProps } from '../../../interfaces/Platforms'; -import { NavPageProps as ExternalProps } from '@uifabric/legacy/lib/components/Nav/Nav.doc'; +import { NavPageProps as ExternalProps } from 'office-ui-fabric-react/lib/components/Nav/Nav.doc'; const related = require('!raw-loader!@uifabric/fabric-website/src/pages/Controls/NavPage/docs/NavRelated.md') as string; diff --git a/apps/fabric-website/webpack.config.js b/apps/fabric-website/webpack.config.js index 0ece017d30fb2..c57d8d4ef3cb4 100644 --- a/apps/fabric-website/webpack.config.js +++ b/apps/fabric-website/webpack.config.js @@ -47,9 +47,6 @@ module.exports = function(env) { 'office-ui-fabric-react$': path.join(__dirname, 'node_modules/office-ui-fabric-react/lib'), 'office-ui-fabric-react/src': path.join(__dirname, 'node_modules/office-ui-fabric-react/src'), 'office-ui-fabric-react/lib': path.join(__dirname, 'node_modules/office-ui-fabric-react/lib'), - '@uifabric/legacy$': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'), - '@uifabric/legacy/src': path.join(__dirname, 'node_modules/@uifabric/legacy/src'), - '@uifabric/legacy/lib': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'), '@uifabric/api-docs/lib': path.join(__dirname, 'node_modules/@uifabric/api-docs/lib') } } diff --git a/apps/fabric-website/webpack.serve.config.js b/apps/fabric-website/webpack.serve.config.js index effb841525cfd..614bacd48d04a 100644 --- a/apps/fabric-website/webpack.serve.config.js +++ b/apps/fabric-website/webpack.serve.config.js @@ -24,9 +24,6 @@ module.exports = resources.createServeConfig({ resolve: { alias: { - '@uifabric/legacy$': path.resolve(__dirname, '../../packages/legacy/src'), - '@uifabric/legacy/lib': path.resolve(__dirname, '../../packages/legacy/src'), - '@uifabric/legacy/src': path.resolve(__dirname, '../../packages/legacy/src'), '@uifabric/fabric-website/src': path.join(__dirname, 'src'), '@uifabric/fabric-website/lib': path.join(__dirname, 'lib'), '@uifabric/example-app-base$': path.resolve(__dirname, '../../packages/example-app-base/src'), diff --git a/apps/ssr-tests/package.json b/apps/ssr-tests/package.json index a7eeaf4f69a8f..f082399a780c6 100644 --- a/apps/ssr-tests/package.json +++ b/apps/ssr-tests/package.json @@ -23,7 +23,6 @@ "@types/webpack-env": "1.13.9", "@microsoft/load-themed-styles": "^1.7.13", "@uifabric/fabric-website-resources": "^6.18.3", - "@uifabric/legacy": "^6.164.5", "@uifabric/prettier-rules": "^1.0.2", "mocha": "^3.3.0", "office-ui-fabric-react": "^6.187.1", diff --git a/apps/ssr-tests/webpack.config.js b/apps/ssr-tests/webpack.config.js index b25bc283d7ef8..ccdeb0b450e46 100644 --- a/apps/ssr-tests/webpack.config.js +++ b/apps/ssr-tests/webpack.config.js @@ -21,9 +21,6 @@ module.exports = resources.createConfig('ssr-tests', false, { 'office-ui-fabric-react$': path.join(__dirname, 'node_modules/office-ui-fabric-react/lib'), '@uifabric/fabric-website-resources/src': path.join(__dirname, 'node_modules/@uifabric/fabric-website-resources/src'), '@uifabric/fabric-website-resources/lib': path.join(__dirname, 'node_modules/@uifabric/fabric-website-resources/lib'), - '@uifabric/legacy$': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'), - '@uifabric/legacy/src': path.join(__dirname, 'node_modules/@uifabric/legacy/src'), - '@uifabric/legacy/lib': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'), '@uifabric/styling/lib': path.join(__dirname, '../../packages/styling/lib'), 'Props.ts.js': 'Props' } diff --git a/apps/vr-tests/package.json b/apps/vr-tests/package.json index e387dc70d5a68..1fec3b939a62f 100644 --- a/apps/vr-tests/package.json +++ b/apps/vr-tests/package.json @@ -42,7 +42,6 @@ "dependencies": { "@uifabric/experiments": "^6.78.2", "@uifabric/set-version": "^1.1.3", - "@uifabric/legacy": "^6.164.5", "@uifabric/react-cards": "^0.3.1", "office-ui-fabric-react": "^6.187.1", "react": ">=16.8.0 <17.0.0", diff --git a/apps/vr-tests/src/stories/DatePicker.stories.tsx b/apps/vr-tests/src/stories/DatePicker.stories.tsx index 68d88508d56ec..4708da92a2208 100644 --- a/apps/vr-tests/src/stories/DatePicker.stories.tsx +++ b/apps/vr-tests/src/stories/DatePicker.stories.tsx @@ -4,7 +4,7 @@ import Screener from 'screener-storybook/src/screener'; import { storiesOf } from '@storybook/react'; import { FabricDecoratorFixedWidth } from '../utilities'; import { Fabric } from 'office-ui-fabric-react'; -import { DatePicker } from '@uifabric/legacy'; +import { DatePicker } from 'office-ui-fabric-react'; const date = new Date(2010, 1, 12); storiesOf('DatePicker', module) diff --git a/apps/vr-tests/src/stories/Nav.stories.tsx b/apps/vr-tests/src/stories/Nav.stories.tsx index 6db443e4959e5..07dfaab96c395 100644 --- a/apps/vr-tests/src/stories/Nav.stories.tsx +++ b/apps/vr-tests/src/stories/Nav.stories.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import Screener from 'screener-storybook/src/screener'; import { storiesOf } from '@storybook/react'; import { FabricDecorator } from '../utilities'; -import { Nav, INavLink } from '@uifabric/legacy/lib/Nav'; +import { Nav, INavLink } from 'office-ui-fabric-react/lib/Nav'; const links: INavLink[] = [ { diff --git a/common/changes/@uifabric/api-docs/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/api-docs/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..c315a78834372 --- /dev/null +++ b/common/changes/@uifabric/api-docs/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/api-docs", + "comment": "Remove reference to legacy package", + "type": "patch" + } + ], + "packageName": "@uifabric/api-docs", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/@uifabric/azure-themes/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/azure-themes/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..e0ca2e5f8e33e --- /dev/null +++ b/common/changes/@uifabric/azure-themes/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/azure-themes", + "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react", + "type": "patch" + } + ], + "packageName": "@uifabric/azure-themes", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/@uifabric/example-app-base/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/example-app-base/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..6c2b3ee035532 --- /dev/null +++ b/common/changes/@uifabric/example-app-base/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/example-app-base", + "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react", + "type": "patch" + } + ], + "packageName": "@uifabric/example-app-base", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/@uifabric/fabric-website-resources/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/fabric-website-resources/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..3853ad56fc500 --- /dev/null +++ b/common/changes/@uifabric/fabric-website-resources/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/fabric-website-resources", + "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react", + "type": "patch" + } + ], + "packageName": "@uifabric/fabric-website-resources", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/@uifabric/fabric-website/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/fabric-website/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..a42d3dfa3372d --- /dev/null +++ b/common/changes/@uifabric/fabric-website/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/fabric-website", + "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react", + "type": "patch" + } + ], + "packageName": "@uifabric/fabric-website", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/@uifabric/fluent-theme/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/fluent-theme/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..64de1a68945f4 --- /dev/null +++ b/common/changes/@uifabric/fluent-theme/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/fluent-theme", + "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react", + "type": "patch" + } + ], + "packageName": "@uifabric/fluent-theme", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/@uifabric/legacy/calendar_2019-05-29-18-08.json b/common/changes/@uifabric/legacy/calendar_2019-05-29-18-08.json deleted file mode 100644 index 12404e7b21094..0000000000000 --- a/common/changes/@uifabric/legacy/calendar_2019-05-29-18-08.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@uifabric/legacy", - "comment": "Move Calendar and DatePicker to legacy package", - "type": "minor" - } - ], - "packageName": "@uifabric/legacy", - "email": "elcraig@microsoft.com" -} \ No newline at end of file diff --git a/common/changes/@uifabric/legacy/calendar_2019-05-29-18-11.json b/common/changes/@uifabric/legacy/calendar_2019-05-29-18-11.json deleted file mode 100644 index c5e21de8957b1..0000000000000 --- a/common/changes/@uifabric/legacy/calendar_2019-05-29-18-11.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "", - "packageName": "@uifabric/legacy", - "type": "none" - } - ], - "packageName": "@uifabric/legacy", - "email": "elcraig@microsoft.com" -} \ No newline at end of file diff --git a/common/changes/@uifabric/legacy/jg-dedupe-react-deps_2019-05-06-20-19.json b/common/changes/@uifabric/legacy/jg-dedupe-react-deps_2019-05-06-20-19.json deleted file mode 100644 index 95588914925fd..0000000000000 --- a/common/changes/@uifabric/legacy/jg-dedupe-react-deps_2019-05-06-20-19.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@uifabric/legacy", - "comment": "Update and dedupe React deps.", - "type": "patch" - } - ], - "packageName": "@uifabric/legacy", - "email": "jagore@microsoft.com" -} \ No newline at end of file diff --git a/common/changes/@uifabric/legacy/nav-props_2019-05-29-18-07.json b/common/changes/@uifabric/legacy/nav-props_2019-05-29-18-07.json deleted file mode 100644 index eed2d55090938..0000000000000 --- a/common/changes/@uifabric/legacy/nav-props_2019-05-29-18-07.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@uifabric/legacy", - "comment": "Remove deprecated unused Nav props", - "type": "major" - } - ], - "packageName": "@uifabric/legacy", - "email": "elcraig@microsoft.com" -} diff --git a/common/changes/@uifabric/migration/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/migration/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..b734a0ea1d269 --- /dev/null +++ b/common/changes/@uifabric/migration/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/migration", + "comment": "Remove migration for nav to legacy", + "type": "patch" + } + ], + "packageName": "@uifabric/migration", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/office-ui-fabric-react/remove-legacy_2019-05-31-21-33.json b/common/changes/office-ui-fabric-react/remove-legacy_2019-05-31-21-33.json new file mode 100644 index 0000000000000..263c9505a102e --- /dev/null +++ b/common/changes/office-ui-fabric-react/remove-legacy_2019-05-31-21-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "office-ui-fabric-react", + "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react", + "type": "patch" + } + ], + "packageName": "office-ui-fabric-react", + "email": "jdh@microsoft.com" +} \ No newline at end of file diff --git a/common/config/rush/shrinkwrap.yaml b/common/config/rush/shrinkwrap.yaml index c1b6592186738..09e0520af7e2b 100644 --- a/common/config/rush/shrinkwrap.yaml +++ b/common/config/rush/shrinkwrap.yaml @@ -23,7 +23,6 @@ dependencies: '@rush-temp/foundation-scenarios': 'file:projects/foundation-scenarios.tgz' '@rush-temp/icons': 'file:projects/icons.tgz' '@rush-temp/jest-serializer-merge-styles': 'file:projects/jest-serializer-merge-styles.tgz' - '@rush-temp/legacy': 'file:projects/legacy.tgz' '@rush-temp/lists': 'file:projects/lists.tgz' '@rush-temp/merge-styles': 'file:projects/merge-styles.tgz' '@rush-temp/migration': 'file:projects/migration.tgz' @@ -15859,7 +15858,7 @@ packages: dev: false name: '@rush-temp/api-docs' resolution: - integrity: sha512-D/uoNSKITHEMv387PcHH2wXfvgGxK5vu0+F9st724u1DlCt/r5zfgj2xeXIzJG1mPVAIREPxTYcXaFQ7l70l7w== + integrity: sha512-tQiiD/ljtHUsF5DVqwJv9d92CGG6JaO+JdlBNC8VUH39XVFpzDy88DqIUPcFu34vxBtaAijN5bm7jfa4tNJDJA== tarball: 'file:projects/api-docs.tgz' version: 0.0.0 'file:projects/azure-themes.tgz': @@ -15869,7 +15868,7 @@ packages: dev: false name: '@rush-temp/azure-themes' resolution: - integrity: sha512-yPJOlXVgoaTZUdTXiQJ2qSmWgFOdWTSWnrazNhPuYFf/qGsPEI3WA3FVZYuPykFX3NoSifKJA5wvmAK7J8Xilw== + integrity: sha512-Th/r0x0UkCR74+CRdMhQP0fIQZy0+h2EO1+YpmVV6U7nats+WP2s79qtGNg9KELxlwJNQj2ZMU3VBC1Jbije4g== tarball: 'file:projects/azure-themes.tgz' version: 0.0.0 'file:projects/build.tgz': @@ -16079,7 +16078,7 @@ packages: dev: false name: '@rush-temp/example-app-base' resolution: - integrity: sha512-RScdXRCEjBKmNV1QRLeWS2O7ddLGNZ24JnpvIxdjV5hhJO9u6SYyh8vuFK71aqVIusOEIcwC0OZ8kgC6JebR2g== + integrity: sha512-6295Q16rJV777HqJ1loltH8YfTkBsw7iMN6N2FoJyp9f7VJgClBq3UWBxnoMZiNw308HK5uQLO32iOS4x+390w== tarball: 'file:projects/example-app-base.tgz' version: 0.0.0 'file:projects/experiments.tgz': @@ -16155,7 +16154,7 @@ packages: dev: false name: '@rush-temp/fabric-website-resources' resolution: - integrity: sha512-p+Zv5JJCm9C6623x/CaQEMjj9aY36DVJkC9VVoRoDDRXeFTm5bFBEC+f6bQ190E30ZyIkQa47fl2x0qkdaJUvQ== + integrity: sha512-rh1W5qCdUFFRiZl6pFjkBWEtbT3O0bWVkbGI4NvMGZEE969iSnGbPD1nFsqW4377E2/Tbj32PWRBVsXG6GD4LA== tarball: 'file:projects/fabric-website-resources.tgz' version: 0.0.0 'file:projects/fabric-website.tgz': @@ -16183,7 +16182,7 @@ packages: dev: false name: '@rush-temp/fabric-website' resolution: - integrity: sha512-Qy8rW4uZsXjflfYLSxS+Ed+EQDG2KarFG3P1gaJzGxqjFGmxgpFxBhTSmoqOvFzRSaOMv6iQ1KT+SaAtgyxgJw== + integrity: sha512-6S9EppCh53cSJkogCklofSpzHL3j4/JCFD2tCq2M2JheREWK4hTXpv3+glnUjmP8UeXnbgeBrSgrGRko8rrtAQ== tarball: 'file:projects/fabric-website.tgz' version: 0.0.0 'file:projects/file-type-icons.tgz': @@ -16207,7 +16206,7 @@ packages: dev: false name: '@rush-temp/fluent-theme' resolution: - integrity: sha512-n6P2MhXD5zuOaC9tl4wr9TSXRVyBZHV37/gCya55Z3X5AlLrepC+7xI7IGM6mMyW81FACLc8r2xWI9aBCAgUbQ== + integrity: sha512-BXAC9YFo9yu3qX0Fa7tRnGgNXoCErN7nyRWOPZejrq3F6x6/BKu0fNgyUkc655QQrTEhZUC9QT4X7XyWCKyP+Q== tarball: 'file:projects/fluent-theme.tgz' version: 0.0.0 'file:projects/foundation-scenarios.tgz': @@ -16281,46 +16280,6 @@ packages: integrity: sha512-Yv8ogSGs0IcFUgQJdBtlUtktX0LJT7YhoccrptLzggtJoJrlFhqcHsv8VNEtnqI3vBpULWumRKDnmto2lkQ1yw== tarball: 'file:projects/jest-serializer-merge-styles.tgz' version: 0.0.0 - 'file:projects/legacy.tgz': - dependencies: - '@microsoft/load-themed-styles': 1.8.86 - '@types/enzyme': 3.1.13 - '@types/enzyme-adapter-react-16': 1.0.3 - '@types/es6-promise': 0.0.32 - '@types/glob': 7.1.1 - '@types/jest': 23.0.0 - '@types/node': 8.10.48 - '@types/prop-types': 15.5.9 - '@types/react': 16.8.11 - '@types/react-dom': 16.8.4 - '@types/react-test-renderer': 16.8.1 - '@types/resemblejs': 1.3.28 - '@types/sinon': 2.2.2 - '@types/webpack-env': 1.13.0 - enzyme: 3.9.0 - enzyme-adapter-react-16: /enzyme-adapter-react-16/1.12.1/ee2efeb9ba09e3479f87e6d53c5a2c00 - enzyme-to-json: /enzyme-to-json/3.3.5/enzyme@3.9.0 - es6-map: 0.1.5 - es6-promise: 4.2.6 - es6-weak-map: 2.0.2 - glob: 7.1.3 - highlight.js: 9.15.6 - jest-snapshot: 24.1.0 - office-ui-fabric-core: 9.6.1 - prop-types: 15.7.2 - react: 16.8.6 - react-dom: /react-dom/16.8.6/react@16.8.6 - react-highlight: 0.10.0 - react-test-renderer: /react-test-renderer/16.8.6/react@16.8.6 - resemblejs: 2.2.6 - sinon: 4.5.0 - tslib: 1.9.3 - dev: false - name: '@rush-temp/legacy' - resolution: - integrity: sha512-JshZFO0ULK0Gm0zckiKGVbUq4pd5Zoovt/L0hGAZUTVDcjfIIfnwUlrgA6h9DsAqfCvfgaFHY7cgcOJcQYKvyA== - tarball: 'file:projects/legacy.tgz' - version: 0.0.0 'file:projects/lists.tgz': dependencies: '@microsoft/load-themed-styles': 1.9.1 @@ -16516,7 +16475,7 @@ packages: dev: false name: '@rush-temp/ssr-tests' resolution: - integrity: sha512-Ec6aN0EZh17ZrE6/LxU4jX/n1o2SHO4H6DlxA5pf3oe4kf7sHKK0d7Aa8yImegHPDEj2QGS99d+Zf5zasEfo/A== + integrity: sha512-k7pGNF3vfTe/gstwPMJCa48mlJUguQLu9SUMdg58EeFN6+ka/VR8iD2GYPhVC6D6lDBrPLIlMNjclmCR/rQXSg== tarball: 'file:projects/ssr-tests.tgz' version: 0.0.0 'file:projects/styling.tgz': @@ -16694,7 +16653,7 @@ packages: dev: false name: '@rush-temp/vr-tests' resolution: - integrity: sha512-sHO3HK0rrBh6aRdQ5iwqfI9K0jKitBTSqMAiQnq92vySPxe3Ljsl4GSC8nj/ytHLsZ/1PLmAgaJJuiZaBo2PqA== + integrity: sha512-iHm6aRTsTLbLGDq8yPoYZvZy8ykZpJCA3/yhWFwbK0t1X0Q59nrivxJsRDI1VgRMGdd5vW+JlDHUGyZNnTw9FA== tarball: 'file:projects/vr-tests.tgz' version: 0.0.0 'file:projects/webpack-utils.tgz': @@ -16740,7 +16699,6 @@ specifiers: '@rush-temp/foundation-scenarios': 'file:./projects/foundation-scenarios.tgz' '@rush-temp/icons': 'file:./projects/icons.tgz' '@rush-temp/jest-serializer-merge-styles': 'file:./projects/jest-serializer-merge-styles.tgz' - '@rush-temp/legacy': 'file:./projects/legacy.tgz' '@rush-temp/lists': 'file:./projects/lists.tgz' '@rush-temp/merge-styles': 'file:./projects/merge-styles.tgz' '@rush-temp/migration': 'file:./projects/migration.tgz' diff --git a/packages/api-docs/package.json b/packages/api-docs/package.json index e7c4d5dc6ece3..db9ed6bb62fe7 100644 --- a/packages/api-docs/package.json +++ b/packages/api-docs/package.json @@ -13,7 +13,6 @@ "devDependencies": { "just-scripts": "~0.15.3", "@types/node": "^8.10.29", - "@uifabric/legacy": "^6.164.5", "@uifabric/merge-styles": "^6.17.4", "@uifabric/styling": "^6.47.6", "@uifabric/tslint-rules": ">=1.0.2 <2.0.0", diff --git a/packages/api-docs/src/generatePageJsonFiles.ts b/packages/api-docs/src/generatePageJsonFiles.ts index 116a790ac5fde..6c5fa14c79f3f 100644 --- a/packages/api-docs/src/generatePageJsonFiles.ts +++ b/packages/api-docs/src/generatePageJsonFiles.ts @@ -1,7 +1,7 @@ import * as path from 'path'; import { generateJson } from './PageJsonGenerator'; -// Generate JSON for office-ui-fabric-react, styling, utilities, merge-styles, and legacy +// Generate JSON for office-ui-fabric-react, styling, utilities, and merge-styles generateJson([ { @@ -15,10 +15,7 @@ generateJson([ kind: 'References' }, { - apiJsonPaths: [ - path.resolve(__dirname, '../../../packages/office-ui-fabric-react/dist/office-ui-fabric-react.api.json'), - path.resolve(__dirname, '../../../packages/legacy/dist/legacy.api.json') - ], + apiJsonPaths: [path.resolve(__dirname, '../../../packages/office-ui-fabric-react/dist/office-ui-fabric-react.api.json')], pageJsonFolderPath: path.resolve(__dirname, '../lib/pages/office-ui-fabric-react'), pageNames: [ 'ActivityItem', diff --git a/packages/azure-themes/package.json b/packages/azure-themes/package.json index 93e9387be5503..6e6a6975ec488 100644 --- a/packages/azure-themes/package.json +++ b/packages/azure-themes/package.json @@ -27,7 +27,6 @@ "@uifabric/build": "*" }, "dependencies": { - "@uifabric/legacy": "^6.164.5", "@uifabric/merge-styles": "^6.17.4", "@uifabric/set-version": "^1.1.3", "office-ui-fabric-react": "^6.187.1", diff --git a/packages/azure-themes/src/azure/styles/DatePicker.styles.ts b/packages/azure-themes/src/azure/styles/DatePicker.styles.ts index 5d37551880ad5..bda25c9b2b86b 100644 --- a/packages/azure-themes/src/azure/styles/DatePicker.styles.ts +++ b/packages/azure-themes/src/azure/styles/DatePicker.styles.ts @@ -1,6 +1,6 @@ import { FontSizes } from '../AzureType'; import * as StyleConstants from '../Constants'; -import { IDatePickerStyles, IDatePickerStyleProps } from '@uifabric/legacy/lib/DatePicker'; +import { IDatePickerStyles, IDatePickerStyleProps } from 'office-ui-fabric-react/lib/DatePicker'; export const DatePickerStyles = (props: IDatePickerStyleProps): Partial => { const { disabled, theme } = props; diff --git a/packages/azure-themes/src/azure/styles/Nav.styles.ts b/packages/azure-themes/src/azure/styles/Nav.styles.ts index 70fcfc8329f3e..a63bb292e7a54 100644 --- a/packages/azure-themes/src/azure/styles/Nav.styles.ts +++ b/packages/azure-themes/src/azure/styles/Nav.styles.ts @@ -1,4 +1,4 @@ -import { INavStyleProps, INavStyles } from '@uifabric/legacy/lib/Nav'; +import { INavStyleProps, INavStyles } from 'office-ui-fabric-react/lib/Nav'; import { borderNone } from '../Constants'; export const NavStyles = (props: INavStyleProps): Partial => { diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json index 574495fa30d78..a94c397e0c645 100644 --- a/packages/dashboard/package.json +++ b/packages/dashboard/package.json @@ -43,7 +43,6 @@ "@uifabric/charting": "^0.28.12", "@uifabric/experiments": "^6.67.1", "@uifabric/fluent-theme": "^0.16.4", - "@uifabric/legacy": "^6.164.5", "@uifabric/set-version": "^1.1.3", "auto-fontsize": "^1.0.18", "office-ui-fabric-react": "^6.164.5", diff --git a/packages/example-app-base/package.json b/packages/example-app-base/package.json index 3a9cabdf678c7..68a666c00cce4 100644 --- a/packages/example-app-base/package.json +++ b/packages/example-app-base/package.json @@ -42,7 +42,6 @@ }, "dependencies": { "@microsoft/load-themed-styles": "^1.7.13", - "@uifabric/legacy": "^6.164.5", "@uifabric/fluent-theme": "^0.16.10", "@uifabric/set-version": "^1.1.3", "color-check": "0.0.2", diff --git a/packages/example-app-base/src/components/App/App.tsx b/packages/example-app-base/src/components/App/App.tsx index 1314a61928873..3ef0b6b51e9b1 100644 --- a/packages/example-app-base/src/components/App/App.tsx +++ b/packages/example-app-base/src/components/App/App.tsx @@ -5,7 +5,7 @@ import { ExampleStatus, IAppProps, IAppStyleProps, IAppStyles } from './App.type import { Fabric } from 'office-ui-fabric-react/lib/Fabric'; import { getStyles } from './App.styles'; import { Header } from '../Header/Header'; -import { INavLink, Nav } from '@uifabric/legacy/lib/Nav'; +import { INavLink, Nav } from 'office-ui-fabric-react/lib/Nav'; import { IProcessedStyleSet } from 'office-ui-fabric-react/lib/Styling'; import { Panel, PanelType } from 'office-ui-fabric-react/lib/Panel'; import { ResponsiveMode, withResponsiveMode } from 'office-ui-fabric-react/lib/utilities/decorators/withResponsiveMode'; diff --git a/packages/example-app-base/src/components/App/App.types.ts b/packages/example-app-base/src/components/App/App.types.ts index 487544fc5a602..c49ed09b758ba 100644 --- a/packages/example-app-base/src/components/App/App.types.ts +++ b/packages/example-app-base/src/components/App/App.types.ts @@ -1,7 +1,7 @@ import { IStyle, ITheme } from 'office-ui-fabric-react/lib/Styling'; import { IStyleFunctionOrObject } from 'office-ui-fabric-react/lib/Utilities'; import { IWithResponsiveModeState } from 'office-ui-fabric-react/lib/utilities/decorators/withResponsiveMode'; -import { INavLink, INavLinkGroup, INavStyleProps } from '@uifabric/legacy/lib/Nav'; +import { INavLink, INavLinkGroup, INavStyleProps } from 'office-ui-fabric-react/lib/Nav'; import { IPanelStyleProps } from 'office-ui-fabric-react/lib/Panel'; import { IAppCustomizations } from '../../utilities/customizations'; import { IHeaderStyleProps } from '../Header/index'; diff --git a/packages/fluent-theme/package.json b/packages/fluent-theme/package.json index 4e1da94e2e12a..729b22ecf5d04 100644 --- a/packages/fluent-theme/package.json +++ b/packages/fluent-theme/package.json @@ -26,7 +26,6 @@ "@uifabric/build": "*" }, "dependencies": { - "@uifabric/legacy": "^6.164.5", "@uifabric/merge-styles": "^6.17.4", "@uifabric/set-version": "^1.1.3", "@uifabric/styling": "^6.47.6", diff --git a/packages/fluent-theme/src/fluent/styles/DatePicker.styles.ts b/packages/fluent-theme/src/fluent/styles/DatePicker.styles.ts index ce56628d07b31..e976921df12e6 100644 --- a/packages/fluent-theme/src/fluent/styles/DatePicker.styles.ts +++ b/packages/fluent-theme/src/fluent/styles/DatePicker.styles.ts @@ -1,4 +1,4 @@ -import { IDatePickerStyleProps, IDatePickerStyles } from '@uifabric/legacy/lib/DatePicker'; +import { IDatePickerStyleProps, IDatePickerStyles } from 'office-ui-fabric-react/lib/DatePicker'; export const DatePickerStyles = (props: IDatePickerStyleProps): Partial => { const { theme } = props; diff --git a/packages/legacy/config/api-extractor.json b/packages/legacy/config/api-extractor.json deleted file mode 100644 index 1479e2a6d4c89..0000000000000 --- a/packages/legacy/config/api-extractor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compiler": { - "configType": "tsconfig", - "rootFolder": "./" - }, - "policies": { - "namespaceSupport": "conservative" - }, - "project": { - "entryPointSourceFile": "lib/index.d.ts" - }, - "validationRules": { - "missingReleaseTags": "allow" - }, - "messages": { - "tsdocMessageReporting": { - "tsdoc-undefined-tag": { - "logLevel": "none" - } - } - } -} \ No newline at end of file diff --git a/packages/legacy/config/pre-copy.json b/packages/legacy/config/pre-copy.json deleted file mode 100644 index 3b79c4b8794b4..0000000000000 --- a/packages/legacy/config/pre-copy.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "copyTo": { - "dist": [ - "./index.html" - ], - "dist/sass": [ - "office-ui-fabric-core/dist/sass/**/*", - "./src/common/_highContrast.scss", - "./src/common/_i18n.scss", - "./src/common/_semanticSlots.scss", - "./src/common/_themeOverrides.scss", - "./src/common/_legacyThemePalette.scss", - "./src/common/_effects.scss", - "./src/common/_themeVariables.scss", - "./src/common/ThemingSass.scss" - ], - "dist/css": [ - "office-ui-fabric-core/dist/css/**/*" - ] - } -} \ No newline at end of file diff --git a/packages/legacy/config/tests.js b/packages/legacy/config/tests.js deleted file mode 100644 index 5c85071d44bd3..0000000000000 --- a/packages/legacy/config/tests.js +++ /dev/null @@ -1,15 +0,0 @@ -/** Jest test setup file. */ - -const { configure } = require('enzyme'); -const { initializeIcons } = require('@uifabric/icons'); -const Adapter = require('enzyme-adapter-react-16'); - -// Initialize icons. -initializeIcons(''); - -global.requestAnimationFrame = callback => { - setTimeout(callback, 0); -}; - -// Configure enzyme. -configure({ adapter: new Adapter() }); diff --git a/packages/legacy/etc/legacy.api.md b/packages/legacy/etc/legacy.api.md deleted file mode 100644 index ebe3fc82c4fee..0000000000000 --- a/packages/legacy/etc/legacy.api.md +++ /dev/null @@ -1,370 +0,0 @@ -## API Review File for "@uifabric/legacy" - -> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). - -```ts - -import { BaseComponent } from 'office-ui-fabric-react/lib/Utilities'; -import * as CSS from 'csstype'; -import { DateRangeType } from 'office-ui-fabric-react/lib/utilities/dateValues/DateValues'; -import { DayOfWeek } from 'office-ui-fabric-react/lib/utilities/dateValues/DateValues'; -import { FirstWeekOfYear } from 'office-ui-fabric-react/lib/utilities/dateValues/DateValues'; -import { IBaseProps } from 'office-ui-fabric-react/lib/Utilities'; -import { IButtonProps } from 'office-ui-fabric-react/lib/Button'; -import { ICalloutProps } from 'office-ui-fabric-react/lib/Callout'; -import { IComponentAs } from 'office-ui-fabric-react/lib/Utilities'; -import { IIconProps } from 'office-ui-fabric-react/lib/Icon'; -import { IRefObject } from 'office-ui-fabric-react/lib/Utilities'; -import { IRenderFunction } from 'office-ui-fabric-react/lib/Utilities'; -import { IStyle } from 'office-ui-fabric-react/lib/Styling'; -import { IStyleFunction } from 'office-ui-fabric-react/lib/Utilities'; -import { IStyleFunctionOrObject } from 'office-ui-fabric-react/lib/Utilities'; -import { ITextFieldProps } from 'office-ui-fabric-react/lib/TextField'; -import { ITheme } from 'office-ui-fabric-react/lib/Styling'; -import * as PropTypes from 'prop-types'; -import * as React_2 from 'react'; - -// @public (undocumented) -export class Calendar extends BaseComponent implements ICalendar { - constructor(props: ICalendarProps); - // (undocumented) - componentDidUpdate(): void; - // (undocumented) - componentWillReceiveProps(nextProps: ICalendarProps): void; - // (undocumented) - static defaultProps: ICalendarProps; - // (undocumented) - focus(): void; - // (undocumented) - render(): JSX.Element; -} - -// Warning: (ae-forgotten-export) The symbol "React" needs to be exported by the entry point index.d.ts -// -// @public -export const DatePicker: React.StatelessComponent; - -// @public (undocumented) -export class DatePickerBase extends BaseComponent implements IDatePicker { - constructor(props: IDatePickerProps); - // (undocumented) - componentDidUpdate(prevProps: IDatePickerProps, prevState: IDatePickerState): void; - // (undocumented) - componentWillReceiveProps(nextProps: IDatePickerProps): void; - // (undocumented) - static defaultProps: IDatePickerProps; - // (undocumented) - focus(): void; - // (undocumented) - render(): JSX.Element; - // (undocumented) - reset(): void; - } - -export { DateRangeType } - -export { DayOfWeek } - -export { FirstWeekOfYear } - -// @public (undocumented) -export interface ICalendar { - focus: () => void; -} - -// @public (undocumented) -export interface ICalendarFormatDateCallbacks { - formatDay: (date: Date) => string; - formatMonthDayYear: (date: Date, strings?: ICalendarStrings) => string; - formatMonthYear: (date: Date, strings?: ICalendarStrings) => string; - formatYear: (date: Date) => string; -} - -// @public (undocumented) -export interface ICalendarIconStrings { - closeIcon?: string; - leftNavigation?: string; - rightNavigation?: string; -} - -// @public (undocumented) -export interface ICalendarProps extends IBaseProps, React.HTMLAttributes { - allFocusable?: boolean; - autoNavigateOnSelection?: boolean; - className?: string; - componentRef?: IRefObject; - dateRangeType?: DateRangeType; - dateTimeFormatter?: ICalendarFormatDateCallbacks; - firstDayOfWeek?: DayOfWeek; - firstWeekOfYear?: FirstWeekOfYear; - highlightCurrentMonth?: boolean; - highlightSelectedMonth?: boolean; - isDayPickerVisible?: boolean; - isMonthPickerVisible?: boolean; - maxDate?: Date; - minDate?: Date; - navigationIcons?: ICalendarIconStrings; - onDismiss?: () => void; - onSelectDate?: (date: Date, selectedDateRangeArray?: Date[]) => void; - restrictedDates?: Date[]; - selectDateOnClick?: boolean; - // @deprecated - shouldFocusOnMount?: boolean; - showCloseButton?: boolean; - showGoToToday?: boolean; - showMonthPickerAsOverlay?: boolean; - showSixWeeksByDefault?: boolean; - showWeekNumbers?: boolean; - strings: ICalendarStrings | null; - today?: Date; - value?: Date; - workWeekDays?: DayOfWeek[]; - yearPickerHidden?: boolean; -} - -// @public (undocumented) -export interface ICalendarState { - isDayPickerVisible?: boolean; - isMonthPickerVisible?: boolean; - navigatedDayDate?: Date; - navigatedMonthDate?: Date; - selectedDate?: Date; -} - -// @public (undocumented) -export interface ICalendarStrings { - closeButtonAriaLabel?: string; - days: string[]; - goToToday: string; - months: string[]; - nextMonthAriaLabel?: string; - nextYearAriaLabel?: string; - prevMonthAriaLabel?: string; - prevYearAriaLabel?: string; - shortDays: string[]; - shortMonths: string[]; - weekNumberFormatString?: string; -} - -// @public (undocumented) -export interface IDatePicker { - focus(): void; - reset(): void; -} - -// @public (undocumented) -export interface IDatePickerProps extends IBaseProps, React.HTMLAttributes { - allFocusable?: boolean; - allowTextInput?: boolean; - ariaLabel?: string; - borderless?: boolean; - calendarAs?: IComponentAs; - calendarProps?: ICalendarProps; - calloutProps?: ICalloutProps; - className?: string; - componentRef?: IRefObject; - dateTimeFormatter?: ICalendarFormatDateCallbacks; - disableAutoFocus?: boolean; - disabled?: boolean; - firstDayOfWeek?: DayOfWeek; - firstWeekOfYear?: FirstWeekOfYear; - formatDate?: (date?: Date) => string; - highlightCurrentMonth?: boolean; - highlightSelectedMonth?: boolean; - initialPickerDate?: Date; - isMonthPickerVisible?: boolean; - isRequired?: boolean; - label?: string; - maxDate?: Date; - minDate?: Date; - onAfterMenuDismiss?: () => void; - onSelectDate?: (date: Date | null | undefined) => void; - parseDateFromString?: (dateStr: string) => Date | null; - pickerAriaLabel?: string; - placeholder?: string; - showCloseButton?: boolean; - showGoToToday?: boolean; - showMonthPickerAsOverlay?: boolean; - showWeekNumbers?: boolean; - strings?: IDatePickerStrings; - styles?: IStyleFunction; - tabIndex?: number; - textField?: ITextFieldProps; - theme?: ITheme; - today?: Date; - underlined?: boolean; - value?: Date; -} - -// @public (undocumented) -export interface IDatePickerState { - // (undocumented) - errorMessage?: string; - // (undocumented) - formattedDate?: string; - // (undocumented) - isDatePickerShown?: boolean; - // (undocumented) - selectedDate?: Date; -} - -// @public (undocumented) -export interface IDatePickerStrings { - closeButtonAriaLabel?: string; - days: string[]; - goToToday: string; - invalidInputErrorMessage?: string; - isOutOfBoundsErrorMessage?: string; - isRequiredErrorMessage?: string; - months: string[]; - nextMonthAriaLabel?: string; - nextYearAriaLabel?: string; - prevMonthAriaLabel?: string; - prevYearAriaLabel?: string; - shortDays: string[]; - shortMonths: string[]; -} - -// @public (undocumented) -export interface IDatePickerStyleProps { - className?: string; - // (undocumented) - disabled?: boolean; - // (undocumented) - isDatePickerShown?: boolean; - // (undocumented) - label?: boolean; - theme: ITheme; -} - -// @public (undocumented) -export interface IDatePickerStyles { - // (undocumented) - callout: IStyle; - // (undocumented) - icon: IStyle; - root: IStyle; - // (undocumented) - textField: IStyle; -} - -// @public (undocumented) -export interface INav { - selectedKey: string | undefined; -} - -// @public (undocumented) -export interface INavLink { - [propertyName: string]: any; - ariaLabel?: string; - automationId?: string; - disabled?: boolean; - forceAnchor?: boolean; - icon?: string; - // @deprecated - iconClassName?: string; - iconProps?: IIconProps; - isExpanded?: boolean; - key?: string; - links?: INavLink[]; - name: string; - onClick?: (ev?: React_2.MouseEvent, item?: INavLink) => void; - target?: string; - title?: string; - url: string; -} - -// @public (undocumented) -export interface INavLinkGroup { - automationId?: string; - collapseByDefault?: boolean; - links: INavLink[]; - name?: string; - onHeaderClick?: (ev?: React_2.MouseEvent, isCollapsing?: boolean) => void; -} - -// @public (undocumented) -export interface INavProps { - ariaLabel?: string; - className?: string; - componentRef?: IRefObject; - expandButtonAriaLabel?: string; - groups: INavLinkGroup[] | null; - initialSelectedKey?: string; - isOnTop?: boolean; - linkAs?: IComponentAs; - onLinkClick?: (ev?: React_2.MouseEvent, item?: INavLink) => void; - onLinkExpandClick?: (ev?: React_2.MouseEvent, item?: INavLink) => void; - onRenderGroupHeader?: IRenderFunction; - onRenderLink?: IRenderFunction; - selectedKey?: string; - styles?: IStyleFunctionOrObject; - theme?: ITheme; -} - -// @public (undocumented) -export interface INavState { - // (undocumented) - isGroupCollapsed: { - [key: string]: boolean; - }; - // (undocumented) - isLinkExpandStateChanged?: boolean; - // (undocumented) - selectedKey?: string; -} - -// @public (undocumented) -export interface INavStyleProps { - className?: string; - groups: INavLinkGroup[] | null; - isButtonEntry?: boolean; - isDisabled?: boolean; - isExpanded?: boolean; - isGroup?: boolean; - isLink?: boolean; - isOnTop?: boolean; - isSelected?: boolean; - leftPadding?: number; - leftPaddingExpanded?: number; - navHeight?: number; - position?: number; - rightPadding?: number; - theme: ITheme; -} - -// @public (undocumented) -export interface INavStyles { - chevronButton: IStyle; - chevronIcon: IStyle; - compositeLink: IStyle; - group: IStyle; - groupContent: IStyle; - link: IStyle; - linkText: IStyle; - navItem: IStyle; - navItems: IStyle; - root: IStyle; -} - -// @public (undocumented) -export function isRelativeUrl(url: string): boolean; - -// @public (undocumented) -export const Nav: React.StatelessComponent; - -// @public (undocumented) -export class NavBase extends React_2.Component implements INav { - constructor(props: INavProps); - // (undocumented) - static defaultProps: INavProps; - // (undocumented) - render(): JSX.Element | null; - // (undocumented) - readonly selectedKey: string | undefined; - } - - -// (No @packageDocumentation comment for this package) - -``` diff --git a/packages/legacy/jest.config.js b/packages/legacy/jest.config.js deleted file mode 100644 index 6a583825c697c..0000000000000 --- a/packages/legacy/jest.config.js +++ /dev/null @@ -1,15 +0,0 @@ -let { createConfig } = require('../../scripts/jest/jest-resources'); -let path = require('path'); - -const config = createConfig({ - setupFiles: [path.resolve(path.join(__dirname, 'config', 'tests.js'))], - - moduleNameMapper: { - 'office-ui-fabric-react/lib/(.*)$': 'office-ui-fabric-react/lib-commonjs/$1', - '@uifabric/legacy/lib/(.*)': '/src/$1' - }, - - snapshotSerializers: [path.resolve(__dirname, './node_modules/@uifabric/jest-serializer-merge-styles')] -}); - -module.exports = config; diff --git a/packages/legacy/jest.dom.config.js b/packages/legacy/jest.dom.config.js deleted file mode 100644 index e9ded2a3f8cfc..0000000000000 --- a/packages/legacy/jest.dom.config.js +++ /dev/null @@ -1,12 +0,0 @@ -let { createConfig } = require('../../scripts/jest/jest-resources'); -let path = require('path'); - -const config = createConfig({ - setupFiles: [path.resolve(path.join(__dirname, 'config', 'tests.js'))], - - testRegex: '(/__tests__/.*|\\.(test|spec))\\.dom\\.(ts|tsx)$', - - preset: 'jest-puppeteer' -}); - -module.exports = config; diff --git a/packages/legacy/just.config.js b/packages/legacy/just.config.js deleted file mode 100644 index 9b02735092d6c..0000000000000 --- a/packages/legacy/just.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const { preset, just } = require('@uifabric/build'); -const { chain, task } = just; - -preset(); - -chain('verify-api-extractor').after('build'); diff --git a/packages/legacy/package.json b/packages/legacy/package.json deleted file mode 100644 index 94dc5282100a3..0000000000000 --- a/packages/legacy/package.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "name": "@uifabric/legacy", - "version": "6.164.5", - "description": "Legacy components for building experiences for Office 365.", - "main": "lib-commonjs/index.js", - "module": "lib/index.js", - "sideEffects": [ - "*.global.*", - "*Examples.*", - "*Example.*", - "lib/version.js" - ], - "typings": "lib/index.d.ts", - "repository": { - "type": "git", - "url": "https://github.com/OfficeDev/office-ui-fabric-react" - }, - "license": "MIT", - "scripts": { - "build": "npx just-scripts build", - "just": "npx just-scripts", - "clean": "npx just-scripts clean", - "code-style": "npx just-scripts code-style", - "start": "cd ../../apps/fabric-website-resources && npm start", - "start-test": "npx just-scripts jest-watch", - "update-sass-theme-files": "node ./scripts/generateDefaultThemeSassFiles.js", - "update-snapshots": "npx just-scripts jest -u", - "update-api": "node ../../scripts/update-api.js", - "codepen": "node ../../scripts/local-codepen.js" - }, - "devDependencies": { - "@types/enzyme": "3.1.13", - "@types/enzyme-adapter-react-16": "1.0.3", - "@types/es6-promise": "0.0.32", - "@types/glob": "^7.1.1", - "@types/jest": "23.0.0", - "@types/node": "^8.10.29", - "@types/prop-types": "15.5.9", - "@types/react": ">=16.8.0 <17.0.0", - "@types/react-dom": ">=16.8.0 <17.0.0", - "@types/react-test-renderer": "^16.0.0", - "@types/resemblejs": "~1.3.28", - "@types/sinon": "2.2.2", - "@types/webpack-env": "1.13.0", - "@uifabric/codepen-loader": "^0.1.0", - "@uifabric/foundation": "^0.7.4", - "@uifabric/jest-serializer-merge-styles": "^6.0.8", - "@uifabric/prettier-rules": "^1.0.1", - "@uifabric/test-utilities": "^6.0.3", - "@uifabric/tslint-rules": "^1.0.1", - "@uifabric/webpack-utils": "^0.8.1", - "enzyme": "^3.4.1", - "enzyme-adapter-react-16": "^1.2.0", - "enzyme-to-json": "^3.3.4", - "es6-map": "^0.1.5", - "es6-promise": "^4.1.0", - "es6-weak-map": "^2.0.2", - "glob": "^7.1.2", - "highlight.js": "^9.12.0", - "jest-snapshot": "24.1.0", - "office-ui-fabric-core": "^9.0.0", - "react": ">=16.8.0 <17.0.0", - "react-dom": ">=16.8.0 <17.0.0", - "react-highlight": "0.10.0", - "react-test-renderer": "^16.3.0", - "resemblejs": "~2.2.3", - "sinon": "^4.1.3", - "@uifabric/build": "*" - }, - "dependencies": { - "@microsoft/load-themed-styles": "^1.7.13", - "@uifabric/foundation": "^0.7.4", - "@uifabric/icons": "^6.5.1", - "@uifabric/merge-styles": "^6.16.4", - "@uifabric/set-version": "^1.1.3", - "@uifabric/styling": "^6.45.2", - "@uifabric/utilities": "^6.35.3", - "office-ui-fabric-react": "^6.164.5", - "prop-types": "^15.5.10", - "tslib": "^1.7.1" - }, - "peerDependencies": { - "react": ">=16.8.0 <17.0.0", - "react-dom": ">=16.8.0 <17.0.0" - } -} diff --git a/packages/legacy/src/index.ts b/packages/legacy/src/index.ts deleted file mode 100644 index af4f9d88f3179..0000000000000 --- a/packages/legacy/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './Calendar'; -export * from './DatePicker'; -export * from './Nav'; - -import './version'; diff --git a/packages/legacy/src/version.ts b/packages/legacy/src/version.ts deleted file mode 100644 index 48de1c90f590d..0000000000000 --- a/packages/legacy/src/version.ts +++ /dev/null @@ -1,4 +0,0 @@ -// @uifabric/legacy@6.164.5 -// Do not modify this file, the file is generated as part of publish. The checked in version is a placeholder only. -import { setVersion } from '@uifabric/set-version'; -setVersion('@uifabric/legacy', '6.164.5'); diff --git a/packages/legacy/tsconfig.json b/packages/legacy/tsconfig.json deleted file mode 100644 index 1503503919ff7..0000000000000 --- a/packages/legacy/tsconfig.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "outDir": "lib", - "target": "es5", - "module": "commonjs", - "jsx": "react", - "declaration": true, - "sourceMap": true, - "experimentalDecorators": true, - "importHelpers": true, - "noUnusedLocals": true, - "forceConsistentCasingInFileNames": true, - "strictNullChecks": true, - "noImplicitAny": true, - "moduleResolution": "node", - "preserveConstEnums": true, - "lib": ["es5", "dom", "es2015.promise"], - "skipLibCheck": true, - "typeRoots": ["node_modules/@types", "../../typings"], - "types": ["jest", "webpack-env", "custom-global"], - "paths": { - "@uifabric/legacy/lib/*": ["./src/*"], - "@uifabric/legacy": ["./src"] - } - }, - "include": ["src"] -} diff --git a/packages/legacy/tslint.json b/packages/legacy/tslint.json deleted file mode 100644 index 4293d1de7dbe9..0000000000000 --- a/packages/legacy/tslint.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": ["@uifabric/tslint-rules"], - "rules": { - "deprecation": false, - "jsx-ban-props": false, - "no-any": false, - "typedef": [false] - } -} diff --git a/packages/migration/src/mods/7.0.0/navToLegacy.ts b/packages/migration/src/mods/7.0.0/navToLegacy.ts deleted file mode 100644 index 916a46e233c9c..0000000000000 --- a/packages/migration/src/mods/7.0.0/navToLegacy.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { IMigrationOptions, migration, ModResult } from '../../migration'; -import { mod } from 'riceburn'; -import { moveImports } from '../../util/MoveImports'; - -const legacyExports = [ - 'INav', - 'INavLink', - 'INavLinkGroup', - 'INavProps', - 'INavState', - 'INavStyleProps', - 'INavStyles', - 'isRelativeUrl', - 'Nav', - 'NavBase' -]; - -const fromPackage = 'office-ui-fabric-react'; -const toPackage = '@uifabric/legacy'; - -export default migration( - 'Nav has moved from office-ui-fabric-react to @uifabric/legacy', - (opts: IMigrationOptions): ModResult[] => { - return mod('**/*.ts?(x)', opts).asTypescript((node, modder) => { - return moveImports(node, modder, fromPackage, toPackage, legacyExports); - }).files; - } -); diff --git a/packages/migration/src/tests/mods/7.0.0/__snapshots__/navPackageMove.test.ts.snap b/packages/migration/src/tests/mods/7.0.0/__snapshots__/navPackageMove.test.ts.snap deleted file mode 100644 index b06ee954c1932..0000000000000 --- a/packages/migration/src/tests/mods/7.0.0/__snapshots__/navPackageMove.test.ts.snap +++ /dev/null @@ -1,30 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Nav package move moves import statements 1`] = ` -"// prettier-ignore -import { Nav, INavLink } from '@uifabric/legacy'; -// prettier-ignore -import { Nav } from '@uifabric/legacy'; -// prettier-ignore -// tslint:disable-next-line: quotemark -import { Nav } from '@uifabric/legacy'; -// prettier-ignore -import { INav, INavLink, INavLinkGroup, INavProps, INavState, INavStyleProps, INavStyles, isRelativeUrl, Nav, NavBase } from '@uifabric/legacy'; -// prettier-ignore -import { Foo, Bar } from 'office-ui-fabric-react'; -import { INav, INavLink, INavLinkGroup, INavProps, INavState, INavStyleProps, INavStyles, isRelativeUrl, Nav, NavBase } from '@uifabric/legacy'; -// prettier-ignore -import { - INav, - INavLink, - INavLinkGroup, - INavProps, - INavState, - INavStyleProps, - INavStyles, - isRelativeUrl, - Nav, - NavBase -} from 'somewhereelse'; -" -`; diff --git a/packages/migration/src/tests/mods/7.0.0/navPackageMove.test.ts b/packages/migration/src/tests/mods/7.0.0/navPackageMove.test.ts deleted file mode 100644 index d00f6c570d5d1..0000000000000 --- a/packages/migration/src/tests/mods/7.0.0/navPackageMove.test.ts +++ /dev/null @@ -1,11 +0,0 @@ -import migration from '../../../mods/7.0.0/navToLegacy'; -import path from 'path'; -import { runMigration } from '../utils'; - -describe('Nav package move', () => { - it('moves import statements', async () => { - const result = await runMigration(migration, path.join('7.0.0', 'nav.tsx')); - expect(result.warnings).toEqual([]); - expect(result.contents).toMatchSnapshot(); - }); -}); diff --git a/packages/office-ui-fabric-react/etc/office-ui-fabric-react.api.md b/packages/office-ui-fabric-react/etc/office-ui-fabric-react.api.md index a082cc4920b5b..0a23b732cc50f 100644 --- a/packages/office-ui-fabric-react/etc/office-ui-fabric-react.api.md +++ b/packages/office-ui-fabric-react/etc/office-ui-fabric-react.api.md @@ -472,6 +472,21 @@ export enum ButtonType { primary = 1 } +// @public (undocumented) +export class Calendar extends BaseComponent implements ICalendar { + constructor(props: ICalendarProps); + // (undocumented) + componentDidUpdate(): void; + // (undocumented) + componentWillReceiveProps(nextProps: ICalendarProps): void; + // (undocumented) + static defaultProps: ICalendarProps; + // (undocumented) + focus(): void; + // (undocumented) + render(): JSX.Element; +} + // Warning: (ae-forgotten-export) The symbol "ICalloutState" needs to be exported by the entry point index.d.ts // // @public (undocumented) @@ -760,6 +775,56 @@ export function createItem(name: string, isValid: boolean): ISuggestionModel; + +// @public (undocumented) +export class DatePickerBase extends BaseComponent implements IDatePicker { + constructor(props: IDatePickerProps); + // (undocumented) + componentDidUpdate(prevProps: IDatePickerProps, prevState: IDatePickerState): void; + // (undocumented) + componentWillReceiveProps(nextProps: IDatePickerProps): void; + // (undocumented) + static defaultProps: IDatePickerProps; + // (undocumented) + focus(): void; + // (undocumented) + render(): JSX.Element; + // (undocumented) + reset(): void; + } + +// @public +export enum DateRangeType { + // (undocumented) + Day = 0, + // (undocumented) + Month = 2, + // (undocumented) + Week = 1, + // (undocumented) + WorkWeek = 3 +} + +// @public +export enum DayOfWeek { + // (undocumented) + Friday = 5, + // (undocumented) + Monday = 1, + // (undocumented) + Saturday = 6, + // (undocumented) + Sunday = 0, + // (undocumented) + Thursday = 4, + // (undocumented) + Tuesday = 2, + // (undocumented) + Wednesday = 3 +} + // @public (undocumented) export const DEFAULT_MASK_CHAR = "_"; @@ -1125,6 +1190,16 @@ export class FacepileBase extends BaseComponent { render(): JSX.Element; } +// @public +export enum FirstWeekOfYear { + // (undocumented) + FirstDay = 0, + // (undocumented) + FirstFourDayWeek = 2, + // (undocumented) + FirstFullWeek = 1 +} + // @public (undocumented) export class FloatingPeoplePicker extends BaseFloatingPeoplePicker { // (undocumented) @@ -1854,6 +1929,85 @@ export interface IButtonStyles { textContainer?: IStyle; } +// @public (undocumented) +export interface ICalendar { + focus: () => void; +} + +// @public (undocumented) +export interface ICalendarFormatDateCallbacks { + formatDay: (date: Date) => string; + formatMonthDayYear: (date: Date, strings?: ICalendarStrings) => string; + formatMonthYear: (date: Date, strings?: ICalendarStrings) => string; + formatYear: (date: Date) => string; +} + +// @public (undocumented) +export interface ICalendarIconStrings { + closeIcon?: string; + leftNavigation?: string; + rightNavigation?: string; +} + +// @public (undocumented) +export interface ICalendarProps extends IBaseProps, React_2.HTMLAttributes { + allFocusable?: boolean; + autoNavigateOnSelection?: boolean; + className?: string; + componentRef?: IRefObject; + dateRangeType?: DateRangeType; + dateTimeFormatter?: ICalendarFormatDateCallbacks; + firstDayOfWeek?: DayOfWeek; + firstWeekOfYear?: FirstWeekOfYear; + highlightCurrentMonth?: boolean; + highlightSelectedMonth?: boolean; + isDayPickerVisible?: boolean; + isMonthPickerVisible?: boolean; + maxDate?: Date; + minDate?: Date; + navigationIcons?: ICalendarIconStrings; + onDismiss?: () => void; + onSelectDate?: (date: Date, selectedDateRangeArray?: Date[]) => void; + restrictedDates?: Date[]; + selectDateOnClick?: boolean; + // @deprecated + shouldFocusOnMount?: boolean; + showCloseButton?: boolean; + showGoToToday?: boolean; + showMonthPickerAsOverlay?: boolean; + showSixWeeksByDefault?: boolean; + showWeekNumbers?: boolean; + strings: ICalendarStrings | null; + today?: Date; + value?: Date; + workWeekDays?: DayOfWeek[]; + yearPickerHidden?: boolean; +} + +// @public (undocumented) +export interface ICalendarState { + isDayPickerVisible?: boolean; + isMonthPickerVisible?: boolean; + navigatedDayDate?: Date; + navigatedMonthDate?: Date; + selectedDate?: Date; +} + +// @public (undocumented) +export interface ICalendarStrings { + closeButtonAriaLabel?: string; + days: string[]; + goToToday: string; + months: string[]; + nextMonthAriaLabel?: string; + nextYearAriaLabel?: string; + prevMonthAriaLabel?: string; + prevYearAriaLabel?: string; + shortDays: string[]; + shortMonths: string[]; + weekNumberFormatString?: string; +} + // @public (undocumented) export interface ICalloutContentStyleProps { backgroundColor?: string; @@ -2886,6 +3040,108 @@ export enum IconType { image = 1 } +// @public (undocumented) +export interface IDatePicker { + focus(): void; + reset(): void; +} + +// @public (undocumented) +export interface IDatePickerProps extends IBaseProps, React_2.HTMLAttributes { + allFocusable?: boolean; + allowTextInput?: boolean; + ariaLabel?: string; + borderless?: boolean; + calendarAs?: IComponentAs; + calendarProps?: ICalendarProps; + calloutProps?: ICalloutProps; + className?: string; + componentRef?: IRefObject; + dateTimeFormatter?: ICalendarFormatDateCallbacks; + disableAutoFocus?: boolean; + disabled?: boolean; + firstDayOfWeek?: DayOfWeek; + firstWeekOfYear?: FirstWeekOfYear; + formatDate?: (date?: Date) => string; + highlightCurrentMonth?: boolean; + highlightSelectedMonth?: boolean; + initialPickerDate?: Date; + isMonthPickerVisible?: boolean; + isRequired?: boolean; + label?: string; + maxDate?: Date; + minDate?: Date; + onAfterMenuDismiss?: () => void; + onSelectDate?: (date: Date | null | undefined) => void; + parseDateFromString?: (dateStr: string) => Date | null; + pickerAriaLabel?: string; + placeholder?: string; + showCloseButton?: boolean; + showGoToToday?: boolean; + showMonthPickerAsOverlay?: boolean; + showWeekNumbers?: boolean; + strings?: IDatePickerStrings; + styles?: IStyleFunction; + tabIndex?: number; + textField?: ITextFieldProps; + theme?: ITheme; + today?: Date; + underlined?: boolean; + value?: Date; +} + +// @public (undocumented) +export interface IDatePickerState { + // (undocumented) + errorMessage?: string; + // (undocumented) + formattedDate?: string; + // (undocumented) + isDatePickerShown?: boolean; + // (undocumented) + selectedDate?: Date; +} + +// @public (undocumented) +export interface IDatePickerStrings { + closeButtonAriaLabel?: string; + days: string[]; + goToToday: string; + invalidInputErrorMessage?: string; + isOutOfBoundsErrorMessage?: string; + isRequiredErrorMessage?: string; + months: string[]; + nextMonthAriaLabel?: string; + nextYearAriaLabel?: string; + prevMonthAriaLabel?: string; + prevYearAriaLabel?: string; + shortDays: string[]; + shortMonths: string[]; +} + +// @public (undocumented) +export interface IDatePickerStyleProps { + className?: string; + // (undocumented) + disabled?: boolean; + // (undocumented) + isDatePickerShown?: boolean; + // (undocumented) + label?: boolean; + theme: ITheme; +} + +// @public (undocumented) +export interface IDatePickerStyles { + // (undocumented) + callout: IStyle; + // (undocumented) + icon: IStyle; + root: IStyle; + // (undocumented) + textField: IStyle; +} + // @public (undocumented) export interface IDetailsCheckboxProps { // (undocumented) @@ -5188,6 +5444,105 @@ export interface IModalStyles { scrollableContent: IStyle; } +// @public (undocumented) +export interface INav { + selectedKey: string | undefined; +} + +// @public (undocumented) +export interface INavLink { + [propertyName: string]: any; + ariaLabel?: string; + automationId?: string; + disabled?: boolean; + forceAnchor?: boolean; + icon?: string; + // @deprecated + iconClassName?: string; + iconProps?: IIconProps; + isExpanded?: boolean; + key?: string; + links?: INavLink[]; + name: string; + onClick?: (ev?: React.MouseEvent, item?: INavLink) => void; + target?: string; + title?: string; + url: string; +} + +// @public (undocumented) +export interface INavLinkGroup { + automationId?: string; + collapseByDefault?: boolean; + links: INavLink[]; + name?: string; + onHeaderClick?: (ev?: React.MouseEvent, isCollapsing?: boolean) => void; +} + +// @public (undocumented) +export interface INavProps { + ariaLabel?: string; + className?: string; + componentRef?: IRefObject; + expandButtonAriaLabel?: string; + groups: INavLinkGroup[] | null; + initialSelectedKey?: string; + isOnTop?: boolean; + linkAs?: IComponentAs; + onLinkClick?: (ev?: React.MouseEvent, item?: INavLink) => void; + onLinkExpandClick?: (ev?: React.MouseEvent, item?: INavLink) => void; + onRenderGroupHeader?: IRenderFunction; + onRenderLink?: IRenderFunction; + selectedKey?: string; + styles?: IStyleFunctionOrObject; + theme?: ITheme; +} + +// @public (undocumented) +export interface INavState { + // (undocumented) + isGroupCollapsed: { + [key: string]: boolean; + }; + // (undocumented) + isLinkExpandStateChanged?: boolean; + // (undocumented) + selectedKey?: string; +} + +// @public (undocumented) +export interface INavStyleProps { + className?: string; + groups: INavLinkGroup[] | null; + isButtonEntry?: boolean; + isDisabled?: boolean; + isExpanded?: boolean; + isGroup?: boolean; + isLink?: boolean; + isOnTop?: boolean; + isSelected?: boolean; + leftPadding?: number; + leftPaddingExpanded?: number; + navHeight?: number; + position?: number; + rightPadding?: number; + theme: ITheme; +} + +// @public (undocumented) +export interface INavStyles { + chevronButton: IStyle; + chevronIcon: IStyle; + compositeLink: IStyle; + group: IStyle; + groupContent: IStyle; + link: IStyle; + linkText: IStyle; + navItem: IStyle; + navItems: IStyle; + root: IStyle; +} + // @public (undocumented) export interface IObjectWithKey { // (undocumented) @@ -6613,6 +6968,9 @@ export interface ISpinnerStyles { screenReaderText?: IStyle; } +// @public (undocumented) +export function isRelativeUrl(url: string): boolean; + // @public (undocumented) export type IStackComponent = IComponent; @@ -7674,6 +8032,20 @@ export class ModalBase extends BaseComponent implemen // @public (undocumented) export const mru: IExtendedPersonaProps[]; +// @public (undocumented) +export const Nav: React_2.StatelessComponent; + +// @public (undocumented) +export class NavBase extends React.Component implements INav { + constructor(props: INavProps); + // (undocumented) + static defaultProps: INavProps; + // (undocumented) + render(): JSX.Element | null; + // (undocumented) + readonly selectedKey: string | undefined; + } + // @public (undocumented) export const NormalPeoplePicker: React.FunctionComponent; diff --git a/packages/legacy/src/Calendar.ts b/packages/office-ui-fabric-react/src/Calendar.ts similarity index 100% rename from packages/legacy/src/Calendar.ts rename to packages/office-ui-fabric-react/src/Calendar.ts diff --git a/packages/legacy/src/DatePicker.ts b/packages/office-ui-fabric-react/src/DatePicker.ts similarity index 100% rename from packages/legacy/src/DatePicker.ts rename to packages/office-ui-fabric-react/src/DatePicker.ts diff --git a/packages/legacy/src/Nav.ts b/packages/office-ui-fabric-react/src/Nav.ts similarity index 100% rename from packages/legacy/src/Nav.ts rename to packages/office-ui-fabric-react/src/Nav.ts diff --git a/packages/legacy/src/components/Calendar/Calendar.doc.tsx b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.doc.tsx similarity index 91% rename from packages/legacy/src/components/Calendar/Calendar.doc.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/Calendar.doc.tsx index f5af7dc804793..8d5306af64ee7 100644 --- a/packages/legacy/src/components/Calendar/Calendar.doc.tsx +++ b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.doc.tsx @@ -5,15 +5,15 @@ import { CalendarButtonExample } from './examples/Calendar.Button.Example'; import { CalendarInlineExample } from './examples/Calendar.Inline.Example'; import { addMonths, addYears, addWeeks, addDays } from 'office-ui-fabric-react/lib/utilities/dateMath/DateMath'; -const CalendarButtonExampleCode = require('!raw-loader!@uifabric/legacy/src/components/Calendar/examples/Calendar.Button.Example.tsx') as string; -const CalendarInlineExampleCode = require('!raw-loader!@uifabric/legacy/src/components/Calendar/examples/Calendar.Inline.Example.tsx') as string; +const CalendarButtonExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/Calendar/examples/Calendar.Button.Example.tsx') as string; +const CalendarInlineExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/Calendar/examples/Calendar.Inline.Example.tsx') as string; const today = new Date(Date.now()); export const CalendarPageProps: IDocPageProps = { title: 'Calendar', componentName: 'Calendar', - componentUrl: 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/packages/legacy/src/components/Calendar', + componentUrl: 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/packages/office-ui-fabric-react/src/components/Calendar', examples: [ { title: 'Inline Calendar', @@ -231,10 +231,10 @@ export const CalendarPageProps: IDocPageProps = { ) } ], - overview: require('!raw-loader!@uifabric/legacy/src/components/Calendar/docs/CalendarOverview.md'), + overview: require('!raw-loader!office-ui-fabric-react/src/components/Calendar/docs/CalendarOverview.md'), bestPractices: '', - dos: require('!raw-loader!@uifabric/legacy/src/components/Calendar/docs/CalendarDos.md'), - donts: require('!raw-loader!@uifabric/legacy/src/components/Calendar/docs/CalendarDonts.md'), + dos: require('!raw-loader!office-ui-fabric-react/src/components/Calendar/docs/CalendarDos.md'), + donts: require('!raw-loader!office-ui-fabric-react/src/components/Calendar/docs/CalendarDonts.md'), isHeaderVisible: true, isFeedbackVisible: true }; diff --git a/packages/legacy/src/components/Calendar/Calendar.scss b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss similarity index 99% rename from packages/legacy/src/components/Calendar/Calendar.scss rename to packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss index 8b71a36575594..44472fa206345 100644 --- a/packages/legacy/src/components/Calendar/Calendar.scss +++ b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss @@ -1,4 +1,4 @@ -@import '~office-ui-fabric-react/src/common/common'; +@import '../../common/common'; // Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE in the project root for license information. // diff --git a/packages/legacy/src/components/Calendar/Calendar.test.tsx b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.test.tsx similarity index 100% rename from packages/legacy/src/components/Calendar/Calendar.test.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/Calendar.test.tsx diff --git a/packages/legacy/src/components/Calendar/Calendar.tsx b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.tsx similarity index 97% rename from packages/legacy/src/components/Calendar/Calendar.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/Calendar.tsx index afbb714528a15..eb3b7356276ed 100644 --- a/packages/legacy/src/components/Calendar/Calendar.tsx +++ b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { ICalendar, ICalendarProps, ICalendarStrings, ICalendarIconStrings, ICalendarFormatDateCallbacks } from './Calendar.types'; -import { DayOfWeek, FirstWeekOfYear, DateRangeType } from 'office-ui-fabric-react/lib/utilities/dateValues/DateValues'; +import { DayOfWeek, FirstWeekOfYear, DateRangeType } from '../../utilities/dateValues/DateValues'; import { CalendarDay, ICalendarDay } from './CalendarDay'; import { CalendarMonth, ICalendarMonth } from './CalendarMonth'; -import { compareDates, getDateRangeArray } from 'office-ui-fabric-react/lib/utilities/dateMath/DateMath'; -import { css, BaseComponent, KeyCodes, getNativeProps, divProperties } from 'office-ui-fabric-react/lib/Utilities'; +import { compareDates, getDateRangeArray } from '../../utilities/dateMath/DateMath'; +import { css, BaseComponent, KeyCodes, getNativeProps, divProperties } from '../../Utilities'; import * as stylesImport from './Calendar.scss'; const styles: any = stylesImport; diff --git a/packages/legacy/src/components/Calendar/Calendar.types.ts b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.types.ts similarity index 97% rename from packages/legacy/src/components/Calendar/Calendar.types.ts rename to packages/office-ui-fabric-react/src/components/Calendar/Calendar.types.ts index 32171a1010bef..bdf07f8be6b01 100644 --- a/packages/legacy/src/components/Calendar/Calendar.types.ts +++ b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.types.ts @@ -1,5 +1,5 @@ -import { DayOfWeek, FirstWeekOfYear, DateRangeType } from 'office-ui-fabric-react/lib/utilities/dateValues/DateValues'; -import { IRefObject, IBaseProps } from 'office-ui-fabric-react/lib/Utilities'; +import { DayOfWeek, FirstWeekOfYear, DateRangeType } from '../../utilities/dateValues/DateValues'; +import { IRefObject, IBaseProps } from '../../Utilities'; export { DayOfWeek, DateRangeType, FirstWeekOfYear }; /** diff --git a/packages/legacy/src/components/Calendar/CalendarDay.tsx b/packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx similarity index 98% rename from packages/legacy/src/components/Calendar/CalendarDay.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx index 6c81f61994bd4..1f1c647d2afad 100644 --- a/packages/legacy/src/components/Calendar/CalendarDay.tsx +++ b/packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx @@ -1,20 +1,9 @@ import * as React from 'react'; -import { - BaseComponent, - KeyCodes, - css, - getId, - getRTL, - getRTLSafeKeyCode, - format, - IRefObject, - findIndex, - find -} from 'office-ui-fabric-react/lib/Utilities'; +import { BaseComponent, KeyCodes, css, getId, getRTL, getRTLSafeKeyCode, format, IRefObject, findIndex, find } from '../../Utilities'; import { ICalendarStrings, ICalendarIconStrings, ICalendarFormatDateCallbacks } from './Calendar.types'; -import { DayOfWeek, FirstWeekOfYear, DateRangeType } from 'office-ui-fabric-react/lib/utilities/dateValues/DateValues'; -import { FocusZone } from 'office-ui-fabric-react/lib/FocusZone'; -import { Icon } from 'office-ui-fabric-react/lib/Icon'; +import { DayOfWeek, FirstWeekOfYear, DateRangeType } from '../../utilities/dateValues/DateValues'; +import { FocusZone } from '../../FocusZone'; +import { Icon } from '../../Icon'; import { addDays, addWeeks, @@ -27,7 +16,7 @@ import { getWeekNumbersInMonth, getMonthStart, getMonthEnd -} from 'office-ui-fabric-react/lib/utilities/dateMath/DateMath'; +} from '../../utilities/dateMath/DateMath'; import * as stylesImport from './Calendar.scss'; const styles: any = stylesImport; diff --git a/packages/legacy/src/components/Calendar/CalendarMonth.tsx b/packages/office-ui-fabric-react/src/components/Calendar/CalendarMonth.tsx similarity index 98% rename from packages/legacy/src/components/Calendar/CalendarMonth.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/CalendarMonth.tsx index 2fdf1148a1717..02e84e0faa3ad 100644 --- a/packages/legacy/src/components/Calendar/CalendarMonth.tsx +++ b/packages/office-ui-fabric-react/src/components/Calendar/CalendarMonth.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { BaseComponent, KeyCodes, css, getRTL, IRefObject } from 'office-ui-fabric-react/lib/Utilities'; +import { BaseComponent, KeyCodes, css, getRTL, IRefObject } from '../../Utilities'; import { ICalendarStrings, ICalendarIconStrings, ICalendarFormatDateCallbacks } from './Calendar.types'; -import { FocusZone } from 'office-ui-fabric-react/lib/FocusZone'; +import { FocusZone } from '../../FocusZone'; import { addYears, setMonth, @@ -10,8 +10,8 @@ import { getMonthStart, getMonthEnd, compareDatePart -} from 'office-ui-fabric-react/lib/utilities/dateMath/DateMath'; -import { Icon } from 'office-ui-fabric-react/lib/Icon'; +} from '../../utilities/dateMath/DateMath'; +import { Icon } from '../../Icon'; import * as stylesImport from './Calendar.scss'; import { CalendarYear, ICalendarYearRange } from './CalendarYear'; const styles: any = stylesImport; diff --git a/packages/legacy/src/components/Calendar/CalendarYear.tsx b/packages/office-ui-fabric-react/src/components/Calendar/CalendarYear.tsx similarity index 98% rename from packages/legacy/src/components/Calendar/CalendarYear.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/CalendarYear.tsx index 515682fb406ef..5fec5b8ab6ba6 100644 --- a/packages/legacy/src/components/Calendar/CalendarYear.tsx +++ b/packages/office-ui-fabric-react/src/components/Calendar/CalendarYear.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; -import { KeyCodes, css, getRTL } from 'office-ui-fabric-react/lib/Utilities'; +import { KeyCodes, css, getRTL } from '../../Utilities'; import { ICalendarIconStrings } from './Calendar.types'; -import { FocusZone } from 'office-ui-fabric-react/lib/FocusZone'; +import { FocusZone } from '../../FocusZone'; import * as stylesImport from './Calendar.scss'; -import { Icon } from 'office-ui-fabric-react/lib/Icon'; +import { Icon } from '../../Icon'; const styles: any = stylesImport; diff --git a/packages/legacy/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap similarity index 100% rename from packages/legacy/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap rename to packages/office-ui-fabric-react/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap diff --git a/packages/legacy/src/components/Calendar/docs/CalendarDonts.md b/packages/office-ui-fabric-react/src/components/Calendar/docs/CalendarDonts.md similarity index 100% rename from packages/legacy/src/components/Calendar/docs/CalendarDonts.md rename to packages/office-ui-fabric-react/src/components/Calendar/docs/CalendarDonts.md diff --git a/packages/legacy/src/components/Calendar/docs/CalendarDos.md b/packages/office-ui-fabric-react/src/components/Calendar/docs/CalendarDos.md similarity index 100% rename from packages/legacy/src/components/Calendar/docs/CalendarDos.md rename to packages/office-ui-fabric-react/src/components/Calendar/docs/CalendarDos.md diff --git a/packages/legacy/src/components/Calendar/docs/CalendarOverview.md b/packages/office-ui-fabric-react/src/components/Calendar/docs/CalendarOverview.md similarity index 100% rename from packages/legacy/src/components/Calendar/docs/CalendarOverview.md rename to packages/office-ui-fabric-react/src/components/Calendar/docs/CalendarOverview.md diff --git a/packages/legacy/src/components/Calendar/examples/Calendar.Button.Example.tsx b/packages/office-ui-fabric-react/src/components/Calendar/examples/Calendar.Button.Example.tsx similarity index 98% rename from packages/legacy/src/components/Calendar/examples/Calendar.Button.Example.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/examples/Calendar.Button.Example.tsx index 7727a4bc1a7cb..c1c5698f5db3e 100644 --- a/packages/legacy/src/components/Calendar/examples/Calendar.Button.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/Calendar/examples/Calendar.Button.Example.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { DefaultButton } from 'office-ui-fabric-react/lib/Button'; import { Callout, DirectionalHint } from 'office-ui-fabric-react/lib/Callout'; -import { Calendar, DayOfWeek } from '@uifabric/legacy/lib/Calendar'; +import { Calendar, DayOfWeek } from 'office-ui-fabric-react/lib/Calendar'; import { FocusTrapZone } from 'office-ui-fabric-react/lib/FocusTrapZone'; const DayPickerStrings = { diff --git a/packages/legacy/src/components/Calendar/examples/Calendar.Inline.Example.tsx b/packages/office-ui-fabric-react/src/components/Calendar/examples/Calendar.Inline.Example.tsx similarity index 98% rename from packages/legacy/src/components/Calendar/examples/Calendar.Inline.Example.tsx rename to packages/office-ui-fabric-react/src/components/Calendar/examples/Calendar.Inline.Example.tsx index bec5fc343ac9b..1010dfbf2e834 100644 --- a/packages/legacy/src/components/Calendar/examples/Calendar.Inline.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/Calendar/examples/Calendar.Inline.Example.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { DefaultButton } from 'office-ui-fabric-react/lib/Button'; import { addDays, getDateRangeArray } from 'office-ui-fabric-react/lib/utilities/dateMath/DateMath'; -import { Calendar, DayOfWeek, DateRangeType } from '@uifabric/legacy/lib/Calendar'; +import { Calendar, DayOfWeek, DateRangeType } from 'office-ui-fabric-react/lib/Calendar'; const DayPickerStrings = { months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], diff --git a/packages/legacy/src/components/Calendar/index.ts b/packages/office-ui-fabric-react/src/components/Calendar/index.ts similarity index 100% rename from packages/legacy/src/components/Calendar/index.ts rename to packages/office-ui-fabric-react/src/components/Calendar/index.ts diff --git a/packages/office-ui-fabric-react/src/components/Callout/CalloutContent.base.tsx b/packages/office-ui-fabric-react/src/components/Callout/CalloutContent.base.tsx index dea15062a998f..1c35f50f8c384 100644 --- a/packages/office-ui-fabric-react/src/components/Callout/CalloutContent.base.tsx +++ b/packages/office-ui-fabric-react/src/components/Callout/CalloutContent.base.tsx @@ -323,8 +323,8 @@ export class CalloutContentBase extends React.Component(); diff --git a/packages/legacy/src/components/DatePicker/DatePicker.doc.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.doc.tsx similarity index 56% rename from packages/legacy/src/components/DatePicker/DatePicker.doc.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.doc.tsx index 9d523ef80dcdc..998a0da15e2bd 100644 --- a/packages/legacy/src/components/DatePicker/DatePicker.doc.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.doc.tsx @@ -8,18 +8,18 @@ import { DatePickerInputExample } from './examples/DatePicker.Input.Example'; import { DatePickerFormatExample } from './examples/DatePicker.Format.Example'; import { DatePickerBoundedExample } from './examples/DatePicker.Bounded.Example'; -const DatePickerBasicExampleCode = require('!raw-loader!@uifabric/legacy/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx') as string; -const DatePickerDisabledExampleCode = require('!raw-loader!@uifabric/legacy/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx') as string; -const DatePickerWeekNumbersExampleCode = require('!raw-loader!@uifabric/legacy/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx') as string; -const DatePickerRequiredExampleCode = require('!raw-loader!@uifabric/legacy/src/components/DatePicker/examples/DatePicker.Required.Example.tsx') as string; -const DatePickerInputExampleCode = require('!raw-loader!@uifabric/legacy/src/components/DatePicker/examples/DatePicker.Input.Example.tsx') as string; -const DatePickerFormatExampleCode = require('!raw-loader!@uifabric/legacy/src/components/DatePicker/examples/DatePicker.Format.Example.tsx') as string; -const DatePickerBoundedExampleCode = require('!raw-loader!@uifabric/legacy/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx') as string; +const DatePickerBasicExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx') as string; +const DatePickerDisabledExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx') as string; +const DatePickerWeekNumbersExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx') as string; +const DatePickerRequiredExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Required.Example.tsx') as string; +const DatePickerInputExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Input.Example.tsx') as string; +const DatePickerFormatExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Format.Example.tsx') as string; +const DatePickerBoundedExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx') as string; export const DatePickerPageProps: IDocPageProps = { title: 'DatePicker', componentName: 'DatePicker', - componentUrl: 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/packages/legacy/src/components/DatePicker', + componentUrl: 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/packages/office-ui-fabric-react/src/components/DatePicker', examples: [ { title: 'Default DatePicker', @@ -57,10 +57,10 @@ export const DatePickerPageProps: IDocPageProps = { view: } ], - overview: require('!raw-loader!@uifabric/legacy/src/components/DatePicker/docs/DatePickerOverview.md'), + overview: require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/docs/DatePickerOverview.md'), bestPractices: '', - dos: require('!raw-loader!@uifabric/legacy/src/components/DatePicker/docs/DatePickerDos.md'), - donts: require('!raw-loader!@uifabric/legacy/src/components/DatePicker/docs/DatePickerDonts.md'), + dos: require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/docs/DatePickerDos.md'), + donts: require('!raw-loader!office-ui-fabric-react/src/components/DatePicker/docs/DatePickerDonts.md'), isHeaderVisible: true, isFeedbackVisible: true }; diff --git a/packages/legacy/src/components/DatePicker/DatePicker.styles.ts b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.styles.ts similarity index 97% rename from packages/legacy/src/components/DatePicker/DatePicker.styles.ts rename to packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.styles.ts index 632e307c7db31..3de50d61bc37d 100644 --- a/packages/legacy/src/components/DatePicker/DatePicker.styles.ts +++ b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.styles.ts @@ -1,5 +1,5 @@ import { IDatePickerStyleProps, IDatePickerStyles } from './DatePicker.types'; -import { IStyle, normalize, getGlobalClassNames, FontSizes } from 'office-ui-fabric-react/lib/Styling'; +import { IStyle, normalize, getGlobalClassNames, FontSizes } from '../../Styling'; const GlobalClassNames = { root: 'ms-DatePicker', diff --git a/packages/legacy/src/components/DatePicker/DatePicker.test.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.test.tsx similarity index 100% rename from packages/legacy/src/components/DatePicker/DatePicker.test.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.test.tsx diff --git a/packages/legacy/src/components/DatePicker/DatePicker.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.tsx similarity index 87% rename from packages/legacy/src/components/DatePicker/DatePicker.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.tsx index d792ac69f8937..6bdd71b2d2576 100644 --- a/packages/legacy/src/components/DatePicker/DatePicker.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.tsx @@ -1,4 +1,4 @@ -import { styled } from 'office-ui-fabric-react/lib/Utilities'; +import { styled } from '../../Utilities'; import { IDatePickerProps, IDatePickerStyleProps, IDatePickerStyles } from './DatePicker.types'; import { DatePickerBase } from './DatePicker.base'; import { styles } from './DatePicker.styles'; diff --git a/packages/legacy/src/components/DatePicker/DatePicker.types.ts b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.types.ts similarity index 95% rename from packages/legacy/src/components/DatePicker/DatePicker.types.ts rename to packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.types.ts index ccf44c3af07f9..90f2abb50bcef 100644 --- a/packages/legacy/src/components/DatePicker/DatePicker.types.ts +++ b/packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.types.ts @@ -1,10 +1,10 @@ import { DayOfWeek, ICalendarProps } from '../../Calendar'; -import { FirstWeekOfYear } from 'office-ui-fabric-react/lib/utilities/dateValues/DateValues'; +import { FirstWeekOfYear } from '../../utilities/dateValues/DateValues'; import { ICalendarFormatDateCallbacks } from '../Calendar/Calendar.types'; -import { IStyle, ITheme } from 'office-ui-fabric-react/lib/Styling'; -import { IRefObject, IBaseProps, IStyleFunction, IComponentAs } from 'office-ui-fabric-react/lib/Utilities'; -import { ICalloutProps } from 'office-ui-fabric-react/lib/Callout'; -import { ITextFieldProps } from 'office-ui-fabric-react/lib/TextField'; +import { IStyle, ITheme } from '../../Styling'; +import { IRefObject, IBaseProps, IStyleFunction, IComponentAs } from '../../Utilities'; +import { ICalloutProps } from '../Callout/Callout.types'; +import { ITextFieldProps } from '../TextField/TextField.types'; /** * {@docCategory DatePicker} diff --git a/packages/legacy/src/components/DatePicker/__snapshots__/DatePicker.test.tsx.snap b/packages/office-ui-fabric-react/src/components/DatePicker/__snapshots__/DatePicker.test.tsx.snap similarity index 100% rename from packages/legacy/src/components/DatePicker/__snapshots__/DatePicker.test.tsx.snap rename to packages/office-ui-fabric-react/src/components/DatePicker/__snapshots__/DatePicker.test.tsx.snap diff --git a/packages/legacy/src/components/DatePicker/docs/DatePickerDonts.md b/packages/office-ui-fabric-react/src/components/DatePicker/docs/DatePickerDonts.md similarity index 100% rename from packages/legacy/src/components/DatePicker/docs/DatePickerDonts.md rename to packages/office-ui-fabric-react/src/components/DatePicker/docs/DatePickerDonts.md diff --git a/packages/legacy/src/components/DatePicker/docs/DatePickerDos.md b/packages/office-ui-fabric-react/src/components/DatePicker/docs/DatePickerDos.md similarity index 100% rename from packages/legacy/src/components/DatePicker/docs/DatePickerDos.md rename to packages/office-ui-fabric-react/src/components/DatePicker/docs/DatePickerDos.md diff --git a/packages/legacy/src/components/DatePicker/docs/DatePickerOverview.md b/packages/office-ui-fabric-react/src/components/DatePicker/docs/DatePickerOverview.md similarity index 100% rename from packages/legacy/src/components/DatePicker/docs/DatePickerOverview.md rename to packages/office-ui-fabric-react/src/components/DatePicker/docs/DatePickerOverview.md diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx similarity index 96% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx index b4361b8ff6bc2..cf845aabf6bd5 100644 --- a/packages/legacy/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Basic.Example.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown'; -import { DatePicker, DayOfWeek, IDatePickerStrings } from '@uifabric/legacy'; +import { DatePicker, DayOfWeek, IDatePickerStrings } from 'office-ui-fabric-react'; import './DatePicker.Examples.scss'; const DayPickerStrings: IDatePickerStrings = { diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx similarity index 95% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx index c63d63c5c76a7..f770fbb941831 100644 --- a/packages/legacy/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Bounded.Example.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { DatePicker, DayOfWeek, IDatePickerStrings } from '@uifabric/legacy/lib/DatePicker'; +import { DatePicker, DayOfWeek, IDatePickerStrings } from 'office-ui-fabric-react/lib/DatePicker'; import { addMonths, addYears } from 'office-ui-fabric-react/lib/utilities/dateMath/DateMath'; import './DatePicker.Examples.scss'; diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx similarity index 94% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx index 6a96a24cd0363..58fcc0813a1e7 100644 --- a/packages/legacy/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Disabled.Example.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { DatePicker, DayOfWeek, IDatePickerStrings } from '@uifabric/legacy/lib/DatePicker'; +import { DatePicker, DayOfWeek, IDatePickerStrings } from 'office-ui-fabric-react/lib/DatePicker'; import './DatePicker.Examples.scss'; const DayPickerStrings: IDatePickerStrings = { diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.Examples.scss b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Examples.scss similarity index 100% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.Examples.scss rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Examples.scss diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.Format.Example.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Format.Example.tsx similarity index 97% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.Format.Example.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Format.Example.tsx index 9ad96033dce5d..cc3ea6076c8d5 100644 --- a/packages/legacy/src/components/DatePicker/examples/DatePicker.Format.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Format.Example.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { DefaultButton } from 'office-ui-fabric-react/lib/Button'; -import { DatePicker, DayOfWeek, IDatePickerStrings } from '@uifabric/legacy/lib/DatePicker'; +import { DatePicker, DayOfWeek, IDatePickerStrings } from 'office-ui-fabric-react/lib/DatePicker'; import './DatePicker.Examples.scss'; const DayPickerStrings: IDatePickerStrings = { diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.Input.Example.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Input.Example.tsx similarity index 95% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.Input.Example.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Input.Example.tsx index 32f829e57053a..61557d85c432d 100644 --- a/packages/legacy/src/components/DatePicker/examples/DatePicker.Input.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Input.Example.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { DefaultButton } from 'office-ui-fabric-react/lib/Button'; -import { DatePicker, DayOfWeek, IDatePickerStrings } from '@uifabric/legacy/lib/DatePicker'; +import { DatePicker, DayOfWeek, IDatePickerStrings } from 'office-ui-fabric-react/lib/DatePicker'; import './DatePicker.Examples.scss'; const DayPickerStrings: IDatePickerStrings = { diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.Required.Example.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Required.Example.tsx similarity index 94% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.Required.Example.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Required.Example.tsx index d331f34e35f12..26101e9a2c9cb 100644 --- a/packages/legacy/src/components/DatePicker/examples/DatePicker.Required.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.Required.Example.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { DatePicker, DayOfWeek, IDatePickerStrings } from '@uifabric/legacy/lib/DatePicker'; +import { DatePicker, DayOfWeek, IDatePickerStrings } from 'office-ui-fabric-react/lib/DatePicker'; import './DatePicker.Examples.scss'; const DayPickerStrings: IDatePickerStrings = { diff --git a/packages/legacy/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx similarity index 96% rename from packages/legacy/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx rename to packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx index fdfe0ae3a1ddf..37d531b451d88 100644 --- a/packages/legacy/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DatePicker/examples/DatePicker.WeekNumbers.Example.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown'; -import { DatePicker, DayOfWeek, IDatePickerStrings } from '@uifabric/legacy/lib/DatePicker'; +import { DatePicker, DayOfWeek, IDatePickerStrings } from 'office-ui-fabric-react/lib/DatePicker'; import './DatePicker.Examples.scss'; const DayPickerStrings: IDatePickerStrings = { diff --git a/packages/legacy/src/components/DatePicker/index.ts b/packages/office-ui-fabric-react/src/components/DatePicker/index.ts similarity index 100% rename from packages/legacy/src/components/DatePicker/index.ts rename to packages/office-ui-fabric-react/src/components/DatePicker/index.ts diff --git a/packages/legacy/src/components/Nav/Nav.base.tsx b/packages/office-ui-fabric-react/src/components/Nav/Nav.base.tsx similarity index 97% rename from packages/legacy/src/components/Nav/Nav.base.tsx rename to packages/office-ui-fabric-react/src/components/Nav/Nav.base.tsx index 67301ff33a0e5..197db2deee372 100644 --- a/packages/legacy/src/components/Nav/Nav.base.tsx +++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.base.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; -import { ActionButton } from 'office-ui-fabric-react/lib/Button'; +import { ActionButton } from '../../Button'; import { buttonStyles } from './Nav.styles'; -import { classNamesFunction, divProperties, getNativeProps, getWindow } from 'office-ui-fabric-react/lib/Utilities'; -import { FocusZone, FocusZoneDirection } from 'office-ui-fabric-react/lib/FocusZone'; -import { Icon } from 'office-ui-fabric-react/lib/Icon'; +import { classNamesFunction, divProperties, getNativeProps, getWindow } from '../../Utilities'; +import { FocusZone, FocusZoneDirection } from '../../FocusZone'; +import { Icon } from '../../Icon'; import { INav, INavLink, INavLinkGroup, INavProps, INavStyleProps, INavStyles } from './Nav.types'; // The number pixels per indentation level for Nav links. diff --git a/packages/legacy/src/components/Nav/Nav.checklist.ts b/packages/office-ui-fabric-react/src/components/Nav/Nav.checklist.ts similarity index 100% rename from packages/legacy/src/components/Nav/Nav.checklist.ts rename to packages/office-ui-fabric-react/src/components/Nav/Nav.checklist.ts diff --git a/packages/legacy/src/components/Nav/Nav.doc.tsx b/packages/office-ui-fabric-react/src/components/Nav/Nav.doc.tsx similarity index 52% rename from packages/legacy/src/components/Nav/Nav.doc.tsx rename to packages/office-ui-fabric-react/src/components/Nav/Nav.doc.tsx index b374bb0f7522d..5476f33a62505 100644 --- a/packages/legacy/src/components/Nav/Nav.doc.tsx +++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.doc.tsx @@ -5,15 +5,15 @@ import { NavFabricDemoAppExample } from './examples/Nav.FabricDemoApp.Example'; import { NavNestedExample } from './examples/Nav.Nested.Example'; import { NavCustomGroupHeadersExample } from './examples/Nav.CustomGroupHeaders.Example'; -const NavBasicExampleCode = require('!raw-loader!@uifabric/legacy/src/components/Nav/examples/Nav.Basic.Example.tsx') as string; -const NavFabricDemoAppExampleCode = require('!raw-loader!@uifabric/legacy/src/components/Nav/examples/Nav.FabricDemoApp.Example.tsx') as string; -const NavNestedExampleCode = require('!raw-loader!@uifabric/legacy/src/components/Nav/examples/Nav.Nested.Example.tsx') as string; -const NavCustomGroupHeadersExampleCode = require('!raw-loader!@uifabric/legacy/src/components/Nav/examples/Nav.CustomGroupHeaders.Example.tsx') as string; +const NavBasicExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/Nav/examples/Nav.Basic.Example.tsx') as string; +const NavFabricDemoAppExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/Nav/examples/Nav.FabricDemoApp.Example.tsx') as string; +const NavNestedExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/Nav/examples/Nav.Nested.Example.tsx') as string; +const NavCustomGroupHeadersExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/Nav/examples/Nav.CustomGroupHeaders.Example.tsx') as string; export const NavPageProps: IDocPageProps = { title: 'Nav', componentName: 'Nav', - componentUrl: 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/packages/legacy/src/components/Nav', + componentUrl: 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/packages/office-ui-fabric-react/src/components/Nav', examples: [ { title: 'Basic nav with sample links', @@ -36,11 +36,11 @@ export const NavPageProps: IDocPageProps = { view: } ], - propertiesTablesSources: [require('!raw-loader!@uifabric/legacy/src/components/Nav/Nav.types.ts')], - overview: require('!raw-loader!@uifabric/legacy/src/components/Nav/docs/NavOverview.md'), + propertiesTablesSources: [require('!raw-loader!office-ui-fabric-react/src/components/Nav/Nav.types.ts')], + overview: require('!raw-loader!office-ui-fabric-react/src/components/Nav/docs/NavOverview.md'), bestPractices: '', - dos: require('!raw-loader!@uifabric/legacy/src/components/Nav/docs/NavDos.md'), - donts: require('!raw-loader!@uifabric/legacy/src/components/Nav/docs/NavDonts.md'), + dos: require('!raw-loader!office-ui-fabric-react/src/components/Nav/docs/NavDos.md'), + donts: require('!raw-loader!office-ui-fabric-react/src/components/Nav/docs/NavDonts.md'), isHeaderVisible: true, isFeedbackVisible: true }; diff --git a/packages/legacy/src/components/Nav/Nav.styles.ts b/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts similarity index 98% rename from packages/legacy/src/components/Nav/Nav.styles.ts rename to packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts index 352dda5845275..552b3abae4d8c 100644 --- a/packages/legacy/src/components/Nav/Nav.styles.ts +++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts @@ -1,5 +1,5 @@ import { INavStyleProps, INavStyles } from './Nav.types'; -import { IButtonStyles } from 'office-ui-fabric-react/lib/Button'; +import { IButtonStyles } from '../../Button'; import { AnimationClassNames, DefaultFontStyles, @@ -8,7 +8,7 @@ import { FontWeights, ZIndexes, getGlobalClassNames -} from 'office-ui-fabric-react/lib/Styling'; +} from '../../Styling'; const GlobalClassNames = { root: 'ms-Nav', diff --git a/packages/legacy/src/components/Nav/Nav.test.tsx b/packages/office-ui-fabric-react/src/components/Nav/Nav.test.tsx similarity index 100% rename from packages/legacy/src/components/Nav/Nav.test.tsx rename to packages/office-ui-fabric-react/src/components/Nav/Nav.test.tsx diff --git a/packages/legacy/src/components/Nav/Nav.tsx b/packages/office-ui-fabric-react/src/components/Nav/Nav.tsx similarity index 82% rename from packages/legacy/src/components/Nav/Nav.tsx rename to packages/office-ui-fabric-react/src/components/Nav/Nav.tsx index 768bad9a1968d..e5c744e87a7cb 100644 --- a/packages/legacy/src/components/Nav/Nav.tsx +++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.tsx @@ -1,4 +1,4 @@ -import { styled } from 'office-ui-fabric-react/lib/Utilities'; +import { styled } from '../../Utilities'; import { INavProps, INavStyleProps, INavStyles } from './Nav.types'; import { NavBase } from './Nav.base'; import { getStyles } from './Nav.styles'; diff --git a/packages/legacy/src/components/Nav/Nav.types.ts b/packages/office-ui-fabric-react/src/components/Nav/Nav.types.ts similarity index 96% rename from packages/legacy/src/components/Nav/Nav.types.ts rename to packages/office-ui-fabric-react/src/components/Nav/Nav.types.ts index 06e7957dd1f07..4e069a4d275d1 100644 --- a/packages/legacy/src/components/Nav/Nav.types.ts +++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.types.ts @@ -1,8 +1,8 @@ import * as React from 'react'; -import { IStyle, ITheme } from 'office-ui-fabric-react/lib/Styling'; -import { IRefObject, IRenderFunction, IStyleFunctionOrObject, IComponentAs } from 'office-ui-fabric-react/lib/Utilities'; -import { IIconProps } from 'office-ui-fabric-react/lib/Icon'; -import { IButtonProps } from 'office-ui-fabric-react/lib/Button'; +import { IStyle, ITheme } from '../../Styling'; +import { IRefObject, IRenderFunction, IStyleFunctionOrObject, IComponentAs } from '../../Utilities'; +import { IIconProps } from '../Icon/Icon.types'; +import { IButtonProps } from '../Button/Button.types'; /** * {@docCategory Nav} diff --git a/packages/legacy/src/components/Nav/__snapshots__/Nav.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap similarity index 100% rename from packages/legacy/src/components/Nav/__snapshots__/Nav.test.tsx.snap rename to packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap diff --git a/packages/legacy/src/components/Nav/docs/NavDonts.md b/packages/office-ui-fabric-react/src/components/Nav/docs/NavDonts.md similarity index 95% rename from packages/legacy/src/components/Nav/docs/NavDonts.md rename to packages/office-ui-fabric-react/src/components/Nav/docs/NavDonts.md index 11c5e84cb4a8d..21bc047073991 100644 --- a/packages/legacy/src/components/Nav/docs/NavDonts.md +++ b/packages/office-ui-fabric-react/src/components/Nav/docs/NavDonts.md @@ -1,2 +1,2 @@ - Overload your Nav. Too many items in the Nav is indicative of an app that is poorly organized or trying to do too much. -- Include actions. You may reserve a space for actions, if you keep them well separated from the main Nav and their appearance makes it obvious that tapping them will execute a command instead of navigating. \ No newline at end of file +- Include actions. You may reserve a space for actions, if you keep them well separated from the main Nav and their appearance makes it obvious that tapping them will execute a command instead of navigating. diff --git a/packages/legacy/src/components/Nav/docs/NavDos.md b/packages/office-ui-fabric-react/src/components/Nav/docs/NavDos.md similarity index 100% rename from packages/legacy/src/components/Nav/docs/NavDos.md rename to packages/office-ui-fabric-react/src/components/Nav/docs/NavDos.md diff --git a/packages/legacy/src/components/Nav/docs/NavOverview.md b/packages/office-ui-fabric-react/src/components/Nav/docs/NavOverview.md similarity index 80% rename from packages/legacy/src/components/Nav/docs/NavOverview.md rename to packages/office-ui-fabric-react/src/components/Nav/docs/NavOverview.md index ff696fb9a2018..3dcbe08656524 100644 --- a/packages/legacy/src/components/Nav/docs/NavOverview.md +++ b/packages/office-ui-fabric-react/src/components/Nav/docs/NavOverview.md @@ -1 +1 @@ -Navs (also called "left nav" or "navigation pane") provide links to the main areas of an app or a site. In larger configurations, the Nav is always on-screen, usually on the left of the view. In smaller configurations, the Nav may collapse into a skinnier version or be completely hidden until the user taps an icon. \ No newline at end of file +Navs (also called "left nav" or "navigation pane") provide links to the main areas of an app or a site. In larger configurations, the Nav is always on-screen, usually on the left of the view. In smaller configurations, the Nav may collapse into a skinnier version or be completely hidden until the user taps an icon. diff --git a/packages/legacy/src/components/Nav/examples/Nav.Basic.Example.tsx b/packages/office-ui-fabric-react/src/components/Nav/examples/Nav.Basic.Example.tsx similarity index 100% rename from packages/legacy/src/components/Nav/examples/Nav.Basic.Example.tsx rename to packages/office-ui-fabric-react/src/components/Nav/examples/Nav.Basic.Example.tsx diff --git a/packages/legacy/src/components/Nav/examples/Nav.CustomGroupHeaders.Example.tsx b/packages/office-ui-fabric-react/src/components/Nav/examples/Nav.CustomGroupHeaders.Example.tsx similarity index 100% rename from packages/legacy/src/components/Nav/examples/Nav.CustomGroupHeaders.Example.tsx rename to packages/office-ui-fabric-react/src/components/Nav/examples/Nav.CustomGroupHeaders.Example.tsx diff --git a/packages/legacy/src/components/Nav/examples/Nav.FabricDemoApp.Example.tsx b/packages/office-ui-fabric-react/src/components/Nav/examples/Nav.FabricDemoApp.Example.tsx similarity index 100% rename from packages/legacy/src/components/Nav/examples/Nav.FabricDemoApp.Example.tsx rename to packages/office-ui-fabric-react/src/components/Nav/examples/Nav.FabricDemoApp.Example.tsx diff --git a/packages/legacy/src/components/Nav/examples/Nav.Nested.Example.tsx b/packages/office-ui-fabric-react/src/components/Nav/examples/Nav.Nested.Example.tsx similarity index 100% rename from packages/legacy/src/components/Nav/examples/Nav.Nested.Example.tsx rename to packages/office-ui-fabric-react/src/components/Nav/examples/Nav.Nested.Example.tsx diff --git a/packages/legacy/src/components/Nav/index.ts b/packages/office-ui-fabric-react/src/components/Nav/index.ts similarity index 100% rename from packages/legacy/src/components/Nav/index.ts rename to packages/office-ui-fabric-react/src/components/Nav/index.ts diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Basic.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Basic.Example.tsx.shot index 09f60620e471b..07df2b09a2d78 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Basic.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Basic.Example.tsx.shot @@ -133,7 +133,6 @@ exports[`Component Examples renders DatePicker.Basic.Example.tsx correctly 1`] = display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #605e5c; @@ -149,13 +148,6 @@ exports[`Component Examples renders DatePicker.Basic.Example.tsx correctly 1`] = font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #666666; - opacity: 1; - } - &:-ms-input-placeholder { - color: #666666; ->>>>>>> upstream/master opacity: 1; } id="DatePicker0-label" diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Bounded.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Bounded.Example.tsx.shot index 86d9f48afda61..88eb78cea40d3 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Bounded.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Bounded.Example.tsx.shot @@ -138,7 +138,6 @@ Wed, 06 Dec 2017 04:41:20 GMT-Wed, 06 Dec 2017 04:41:20 GMT display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #605e5c; @@ -154,13 +153,6 @@ Wed, 06 Dec 2017 04:41:20 GMT-Wed, 06 Dec 2017 04:41:20 GMT font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #666666; - opacity: 1; - } - &:-ms-input-placeholder { - color: #666666; ->>>>>>> upstream/master opacity: 1; } id="DatePicker0-label" diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Disabled.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Disabled.Example.tsx.shot index a2c61a5a039e3..580b7f3e463a2 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Disabled.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Disabled.Example.tsx.shot @@ -134,7 +134,6 @@ exports[`Component Examples renders DatePicker.Disabled.Example.tsx correctly 1` display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #a19f9d; @@ -150,13 +149,6 @@ exports[`Component Examples renders DatePicker.Disabled.Example.tsx correctly 1` font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #a6a6a6; - opacity: 1; - } - &:-ms-input-placeholder { - color: #a6a6a6; ->>>>>>> upstream/master opacity: 1; } disabled={true} @@ -366,7 +358,6 @@ exports[`Component Examples renders DatePicker.Disabled.Example.tsx correctly 1` display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #a19f9d; @@ -382,13 +373,6 @@ exports[`Component Examples renders DatePicker.Disabled.Example.tsx correctly 1` font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #a6a6a6; - opacity: 1; - } - &:-ms-input-placeholder { - color: #a6a6a6; ->>>>>>> upstream/master opacity: 1; } disabled={true} diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Format.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Format.Example.tsx.shot index 9f75106afd600..62fa84a41bb99 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Format.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Format.Example.tsx.shot @@ -164,7 +164,6 @@ exports[`Component Examples renders DatePicker.Format.Example.tsx correctly 1`] display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #605e5c; @@ -180,13 +179,6 @@ exports[`Component Examples renders DatePicker.Format.Example.tsx correctly 1`] font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #666666; - opacity: 1; - } - &:-ms-input-placeholder { - color: #666666; ->>>>>>> upstream/master opacity: 1; } id="DatePicker0-label" diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Input.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Input.Example.tsx.shot index 3409ccb80bbce..c408b44c53d88 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Input.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Input.Example.tsx.shot @@ -164,7 +164,6 @@ exports[`Component Examples renders DatePicker.Input.Example.tsx correctly 1`] = display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #605e5c; @@ -180,13 +179,6 @@ exports[`Component Examples renders DatePicker.Input.Example.tsx correctly 1`] = font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #666666; - opacity: 1; - } - &:-ms-input-placeholder { - color: #666666; ->>>>>>> upstream/master opacity: 1; } id="DatePicker0-label" diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Required.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Required.Example.tsx.shot index 43c9249d6c8ff..9d2bbac4298ac 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Required.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.Required.Example.tsx.shot @@ -171,7 +171,6 @@ exports[`Component Examples renders DatePicker.Required.Example.tsx correctly 1` display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #605e5c; @@ -187,13 +186,6 @@ exports[`Component Examples renders DatePicker.Required.Example.tsx correctly 1` font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #666666; - opacity: 1; - } - &:-ms-input-placeholder { - color: #666666; ->>>>>>> upstream/master opacity: 1; } id="DatePicker0-label" @@ -381,7 +373,6 @@ exports[`Component Examples renders DatePicker.Required.Example.tsx correctly 1` display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #605e5c; @@ -397,13 +388,6 @@ exports[`Component Examples renders DatePicker.Required.Example.tsx correctly 1` font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #666666; - opacity: 1; - } - &:-ms-input-placeholder { - color: #666666; ->>>>>>> upstream/master opacity: 1; } id="DatePicker3-label" diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.WeekNumbers.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.WeekNumbers.Example.tsx.shot index 675f60a5fe4b9..42d91e91865f8 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.WeekNumbers.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DatePicker.WeekNumbers.Example.tsx.shot @@ -133,7 +133,6 @@ exports[`Component Examples renders DatePicker.WeekNumbers.Example.tsx correctly display: none; } &::placeholder { -<<<<<<< HEAD -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: #605e5c; @@ -149,13 +148,6 @@ exports[`Component Examples renders DatePicker.WeekNumbers.Example.tsx correctly font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; font-weight: 400; -======= - color: #666666; - opacity: 1; - } - &:-ms-input-placeholder { - color: #666666; ->>>>>>> upstream/master opacity: 1; } id="DatePicker0-label" diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/DetailsList.Advanced.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/DetailsList.Advanced.Example.tsx.shot index 3758c665ab2d8..15a3d50dd22d6 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/DetailsList.Advanced.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/DetailsList.Advanced.Example.tsx.shot @@ -4,7 +4,7 @@ exports[`Component Examples renders DetailsList.Advanced.Example.tsx correctly 1
diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/Layer.Basic.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/Layer.Basic.Example.tsx.shot index d4829332668c3..13b07580c05bd 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/Layer.Basic.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/Layer.Basic.Example.tsx.shot @@ -146,7 +146,7 @@ exports[`Component Examples renders Layer.Basic.Example.tsx correctly 1`] = ` Hello world.
- Fri, 06 Jan 2017 04:41:20 GMT + Wed, 06 Dec 2017 04:41:20 GMT
diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Basic.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Basic.Example.tsx.shot index 151b8ec423dab..98a98d29f53c1 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Basic.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Basic.Example.tsx.shot @@ -193,10 +193,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -354,10 +350,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -508,10 +500,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -654,10 +642,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -814,10 +798,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -968,10 +948,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -1110,10 +1086,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -1261,10 +1233,6 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.CustomGroupHeaders.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.CustomGroupHeaders.Example.tsx.shot index dc867f9297eac..66f7d72f0e4b1 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.CustomGroupHeaders.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.CustomGroupHeaders.Example.tsx.shot @@ -104,10 +104,6 @@ exports[`Component Examples renders Nav.CustomGroupHeaders.Example.tsx correctly font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -254,10 +250,6 @@ exports[`Component Examples renders Nav.CustomGroupHeaders.Example.tsx correctly font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -440,10 +432,6 @@ exports[`Component Examples renders Nav.CustomGroupHeaders.Example.tsx correctly font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -590,10 +578,6 @@ exports[`Component Examples renders Nav.CustomGroupHeaders.Example.tsx correctly font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; diff --git a/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Nested.Example.tsx.shot b/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Nested.Example.tsx.shot index 3c0a422013a28..936bf6b6c05ef 100644 --- a/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Nested.Example.tsx.shot +++ b/packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Nested.Example.tsx.shot @@ -187,10 +187,6 @@ exports[`Component Examples renders Nav.Nested.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; @@ -423,10 +419,6 @@ exports[`Component Examples renders Nav.Nested.Example.tsx correctly 1`] = ` font-weight: 400; height: 36px; line-height: 36px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; outline: transparent; overflow: hidden; padding-bottom: 0; diff --git a/packages/office-ui-fabric-react/src/index.ts b/packages/office-ui-fabric-react/src/index.ts index 713d096cd2882..ee16b5d3aa28e 100644 --- a/packages/office-ui-fabric-react/src/index.ts +++ b/packages/office-ui-fabric-react/src/index.ts @@ -3,6 +3,7 @@ export * from './Autofill'; export * from './Announced'; export * from './Breadcrumb'; export * from './Button'; +export * from './Calendar'; export * from './Callout'; export * from './Check'; export * from './Checkbox'; @@ -14,6 +15,7 @@ export * from './ColorPicker'; export * from './ComboBox'; export * from './CommandBar'; export * from './ContextualMenu'; +export * from './DatePicker'; export * from './DetailsList'; export * from './Dialog'; export * from './Divider'; @@ -41,6 +43,7 @@ export * from './List'; export * from './MarqueeSelection'; export * from './MessageBar'; export * from './Modal'; +export * from './Nav'; export * from './OverflowSet'; export * from './Overlay'; export * from './Panel'; diff --git a/rush.json b/rush.json index f3a57137d76df..7f16e4240544e 100644 --- a/rush.json +++ b/rush.json @@ -285,11 +285,6 @@ "projectFolder": "packages/experiments", "versionPolicyName": "lockedMajor" }, - { - "packageName": "@uifabric/legacy", - "projectFolder": "packages/legacy", - "versionPolicyName": "lockedMajor" - }, { "packageName": "@uifabric/foundation", "projectFolder": "packages/foundation",