diff --git a/package-lock.json b/package-lock.json index 488718e..7d34b1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,55 +71,6 @@ "@types/express": "*" } }, - "@types/d3-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-1.2.1.tgz", - "integrity": "sha512-YBaAfimGdWE4nDuoGVKsH89/dkz2hWZ0i8qC+xxqmqi+XJ/aXiRF0jPtzXmN7VdkpVjy1xuDmM5/m1FNuB6VWA==" - }, - "@types/d3-axis": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-1.0.10.tgz", - "integrity": "sha512-5YF0wfdQMPKw01VAAupLIlg/T4pn5M3/vL9u0KZjiemnVnnKBEWE24na4X1iW+TfZiYJ8j+BgK2KFYnAAT54Ug==", - "requires": { - "@types/d3-selection": "*" - } - }, - "@types/d3-path": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-1.0.8.tgz", - "integrity": "sha512-AZGHWslq/oApTAHu9+yH/Bnk63y9oFOMROtqPAtxl5uB6qm1x2lueWdVEjsjjV3Qc2+QfuzKIwIR5MvVBakfzA==" - }, - "@types/d3-scale": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-2.0.0.tgz", - "integrity": "sha512-fFLSdP3p9qQQ3W6ouO3GBI4Qg94CSykTWVc61U8SI1V62dfBWtOigBj5voxDcOniwh9MjKzTHldMSsGJ5qAFpA==", - "requires": { - "@types/d3-time": "*" - } - }, - "@types/d3-selection": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.3.0.tgz", - "integrity": "sha512-1SJhi3kTk/SHHIE6XkHuHU2REYkbSOjkQuo3HT71FOTs8/tjeGcvtXMsX4N3kU1UE1nVG+A5pg7TSjuJ4zUN3A==" - }, - "@types/d3-shape": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-1.3.1.tgz", - "integrity": "sha512-usqdvUvPJ7AJNwpd2drOzRKs1ELie53p2m2GnPKr076/ADM579jVTJ5dPsoZ5E/CMNWk8lvPWYQSvilpp6jjwg==", - "requires": { - "@types/d3-path": "*" - } - }, - "@types/d3-time": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.0.10.tgz", - "integrity": "sha512-aKf62rRQafDQmSiv1NylKhIMmznsjRN+MnXRXTqHoqm0U/UZzVpdrtRnSIfdiLS616OuC1soYeX1dBg2n1u8Xw==" - }, - "@types/d3-time-format": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.1.1.tgz", - "integrity": "sha512-tJSyXta8ZyJ52wDDHA96JEsvkbL6jl7wowGmuf45+fAkj5Y+SQOnz0N7/H68OWmPshPsAaWMQh+GAws44IzH3g==" - }, "@types/enzyme": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.9.0.tgz", @@ -237,76 +188,6 @@ "@types/node": "*" } }, - "@uifabric/azure-themes": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@uifabric/azure-themes/-/azure-themes-0.1.5.tgz", - "integrity": "sha512-KCxnqpn+KtjLzNKAXYAC3Zs3PBsGqHUBb0oAIH8iaG+4RY5Y/kkD6M0LCuD1owpssfvqWwEug6eW3gA06GtJyQ==", - "requires": { - "@uifabric/merge-styles": ">=6.15.2 <7.0.0", - "@uifabric/set-version": ">=1.1.3 <2.0.0", - "office-ui-fabric-react": ">=6.132.0 <7.0.0", - "tslib": "^1.7.1" - } - }, - "@uifabric/charting": { - "version": "0.28.7", - "resolved": "https://registry.npmjs.org/@uifabric/charting/-/charting-0.28.7.tgz", - "integrity": "sha512-JWQOcUGQpSxunTOiVmWqOqDYk1vuyK/8EHmhGrs2Imm1aArSCROVwJ8xiMzgF3x15OWJIu8uZdLnrhAcmuLehA==", - "requires": { - "@microsoft/load-themed-styles": "^1.7.13", - "@types/d3-array": "1.2.1", - "@types/d3-axis": "1.0.10", - "@types/d3-scale": "2.0.0", - "@types/d3-selection": "1.3.0", - "@types/d3-shape": "^1.2.3", - "@types/d3-time-format": "^2.1.0", - "@uifabric/icons": ">=6.3.0 <7.0.0", - "@uifabric/set-version": ">=1.1.3 <2.0.0", - "d3-array": "1.2.1", - "d3-axis": "1.0.8", - "d3-scale": "2.0.0", - "d3-selection": "1.3.0", - "d3-shape": "^1.2.0", - "d3-time-format": "^2.1.3", - "office-ui-fabric-react": ">=6.139.0 <7.0.0", - "prop-types": "^15.5.10", - "tslib": "^1.7.1" - } - }, - "@uifabric/experiments": { - "version": "6.57.0", - "resolved": "https://registry.npmjs.org/@uifabric/experiments/-/experiments-6.57.0.tgz", - "integrity": "sha512-jA787O630Vcgme1hkWfvMpxht1nY/+Xe3k1EoFnexHBgINorxap5VXYBIQygc8x84DmODgvxOaDP9XsewDIdFQ==", - "requires": { - "@microsoft/load-themed-styles": "^1.7.13", - "@uifabric/azure-themes": ">=0.1.5 <1.0.0", - "@uifabric/charting": "^0.28.7", - "@uifabric/file-type-icons": ">=6.4.1 <7.0.0", - "@uifabric/fluent-theme": ">=0.14.1 <1.0.0", - "@uifabric/foundation": ">=0.7.1 <1.0.0", - "@uifabric/icons": ">=6.3.0 <7.0.0", - "@uifabric/merge-styles": ">=6.15.2 <7.0.0", - "@uifabric/set-version": ">=1.1.3 <2.0.0", - "@uifabric/styling": ">=6.41.0 <7.0.0", - "@uifabric/theme-samples": ">=0.1.4 <1.0.0", - "@uifabric/utilities": ">=6.29.1 <7.0.0", - "@uifabric/variants": ">=6.14.0 <7.0.0", - "deep-assign": "^2.0.0", - "office-ui-fabric-react": ">=6.140.0 <7.0.0", - "prop-types": "^15.5.10", - "tslib": "^1.7.1" - } - }, - "@uifabric/file-type-icons": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@uifabric/file-type-icons/-/file-type-icons-6.4.1.tgz", - "integrity": "sha512-T6wGiA/RjLqRE+P5RRObpcRJ+ejh4ZwZX584GgEymOCcU7kjzWSZR7imTA65FbUMUhXxR68b3oiWgPSaCAXE8w==", - "requires": { - "@uifabric/set-version": ">=1.1.3 <2.0.0", - "@uifabric/styling": ">=6.38.0 <7.0.0", - "tslib": "^1.7.1" - } - }, "@uifabric/fluent-theme": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/@uifabric/fluent-theme/-/fluent-theme-0.14.1.tgz", @@ -332,12 +213,12 @@ } }, "@uifabric/icons": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@uifabric/icons/-/icons-6.3.0.tgz", - "integrity": "sha512-jMCa/liL7YCvu0xJRudQsU3oR1O7NuCwkFe392y4ZEXFlTsPpe1LeE4iZr6UbhJLHiEWKw5Uep8pMCuAcCXQdg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@uifabric/icons/-/icons-6.4.0.tgz", + "integrity": "sha512-pbKu3OnWaRIeDqMFhicDrrcqicxNqoHpJpknZR9N2xxoPnYMnt2ZOhBNnAxoVVcxHlWkFNg0rvFrOAQGn+S5/Q==", "requires": { "@uifabric/set-version": ">=1.1.3 <2.0.0", - "@uifabric/styling": ">=6.35.0 <7.0.0", + "@uifabric/styling": ">=6.41.0 <7.0.0", "tslib": "^1.7.1" } }, @@ -2464,83 +2345,6 @@ "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", "dev": true }, - "d3-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.1.tgz", - "integrity": "sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw==" - }, - "d3-axis": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.8.tgz", - "integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo=" - }, - "d3-collection": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz", - "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==" - }, - "d3-color": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz", - "integrity": "sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw==" - }, - "d3-format": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.3.2.tgz", - "integrity": "sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ==" - }, - "d3-interpolate": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.3.2.tgz", - "integrity": "sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==", - "requires": { - "d3-color": "1" - } - }, - "d3-path": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.7.tgz", - "integrity": "sha512-q0cW1RpvA5c5ma2rch62mX8AYaiLX0+bdaSM2wxSU9tXjU4DNvkx9qiUvjkuWCj3p22UO/hlPivujqMiR9PDzA==" - }, - "d3-scale": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.0.0.tgz", - "integrity": "sha512-Sa2Ny6CoJT7x6dozxPnvUQT61epGWsgppFvnNl8eJEzfJBG0iDBBTJAtz2JKem7Mb+NevnaZiDiIDHsuWkv6vg==", - "requires": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - }, - "d3-selection": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.3.0.tgz", - "integrity": "sha512-qgpUOg9tl5CirdqESUAu0t9MU/t3O9klYfGfyKsXEmhyxyzLpzpeh08gaxBUTQw1uXIOkr/30Ut2YRjSSxlmHA==" - }, - "d3-shape": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.4.tgz", - "integrity": "sha512-izaz4fOpOnY3CD17hkZWNxbaN70sIGagLR/5jb6RS96Y+6VqX+q1BQf1av6QSBRdfULi3Gb8Js4CzG4+KAPjMg==", - "requires": { - "d3-path": "1" - } - }, - "d3-time": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.11.tgz", - "integrity": "sha512-Z3wpvhPLW4vEScGeIMUckDW7+3hWKOQfAWg/U7PlWBnQmeKQ00gCUsTtWSYulrKNA7ta8hJ+xXc6MHrMuITwEw==" - }, - "d3-time-format": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.3.tgz", - "integrity": "sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==", - "requires": { - "d3-time": "1" - } - }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -2602,14 +2406,6 @@ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, - "deep-assign": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-2.0.0.tgz", - "integrity": "sha1-6+BrHwfwja5ZdiDj3RYi83GhxXI=", - "requires": { - "is-obj": "^1.0.0" - } - }, "deep-equal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", @@ -3767,8 +3563,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -3786,13 +3581,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3805,18 +3598,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -3919,8 +3709,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -3930,7 +3719,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3943,20 +3731,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3973,7 +3758,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4046,8 +3830,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -4057,7 +3840,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4133,8 +3915,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -4164,7 +3945,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4182,7 +3962,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4221,13 +4000,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -5168,7 +4945,8 @@ "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true }, "is-path-cwd": { "version": "1.0.0", @@ -7744,19 +7522,32 @@ "dev": true }, "office-ui-fabric-react": { - "version": "6.140.0", - "resolved": "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-6.140.0.tgz", - "integrity": "sha512-fYW9LnB+JYCCHC56gtA1T6wIj3owElLaiYwlJuRmve7MU/1u73cxCLhKfBojXcD9cK+aIsjYMN/IJCJga119Zg==", + "version": "6.144.0", + "resolved": "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-6.144.0.tgz", + "integrity": "sha512-3mWm6nrqX5UkZFLD37mBEO2tZqtfjY22dC/s6/UH3GnpL8cAccL2e3xk+TaJZpIyTxh3ir7VYg1AVH96+3WKcQ==", "requires": { "@microsoft/load-themed-styles": "^1.7.13", "@uifabric/foundation": ">=0.7.1 <1.0.0", - "@uifabric/icons": ">=6.3.0 <7.0.0", + "@uifabric/icons": ">=6.4.0 <7.0.0", "@uifabric/merge-styles": ">=6.15.2 <7.0.0", "@uifabric/set-version": ">=1.1.3 <2.0.0", "@uifabric/styling": ">=6.41.0 <7.0.0", - "@uifabric/utilities": ">=6.29.1 <7.0.0", + "@uifabric/utilities": ">=6.29.3 <7.0.0", "prop-types": "^15.5.10", "tslib": "^1.7.1" + }, + "dependencies": { + "@uifabric/utilities": { + "version": "6.29.3", + "resolved": "https://registry.npmjs.org/@uifabric/utilities/-/utilities-6.29.3.tgz", + "integrity": "sha512-c+Kkk4416XY9BVdceCxq6vMktI21quJWYbPStn0Ltvn84XBkhsb4YelloUG4YSwLz7Yhdy5i4eYSArNgvEt4fQ==", + "requires": { + "@uifabric/merge-styles": ">=6.15.2 <7.0.0", + "@uifabric/set-version": ">=1.1.3 <2.0.0", + "prop-types": "^15.5.10", + "tslib": "^1.7.1" + } + } } }, "on-finished": { diff --git a/package.json b/package.json index 23d57c7..0eaf2c6 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "webpack-dev-server": "^3.1.14" }, "dependencies": { - "@uifabric/experiments": "^6.57.0", "@uifabric/fluent-theme": "^0.14.1", + "@uifabric/theme-samples": "^0.1.4", "enzyme": "^3.9.0", "enzyme-adapter-react-16": "^1.9.1", "express": "^4.16.4", @@ -57,7 +57,7 @@ "immer": "^1.12.1", "live-server": "^1.2.1", "marked": "^0.6.1", - "office-ui-fabric-react": "^6.140.0", + "office-ui-fabric-react": "^6.144.0", "react": "^16.7.0", "react-dom": "^16.7.0", "react-redux": "^6.0.0", diff --git a/playground/src/components/TodoFooter.tsx b/playground/src/components/TodoFooter.tsx index fa0a9c3..889f05c 100644 --- a/playground/src/components/TodoFooter.tsx +++ b/playground/src/components/TodoFooter.tsx @@ -1,8 +1,7 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; + import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Stack, Text } from 'office-ui-fabric-react'; import { actionsWithService } from '../actions'; import { connect } from 'react-redux'; diff --git a/playground/src/components/TodoHeader.tsx b/playground/src/components/TodoHeader.tsx index 79a5648..8fe1c8c 100644 --- a/playground/src/components/TodoHeader.tsx +++ b/playground/src/components/TodoHeader.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Pivot, PivotItem, TextField, Stack } from 'office-ui-fabric-react'; +import { Pivot, PivotItem, TextField, Stack, Text } from 'office-ui-fabric-react'; import { FilterTypes, Store } from '../store'; import { actionsWithService, actions } from '../actions'; import { connect } from 'react-redux'; diff --git a/step2-02/README.md b/step2-02/README.md index d5bdab9..554be43 100644 --- a/step2-02/README.md +++ b/step2-02/README.md @@ -2,7 +2,14 @@ [Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/) -UI Fabric is a Component Library that is developed to reflect the latest Microsoft design language. It is used in many Microsoft web applications and is developed in the open: +UI Fabric is a Component Library that is developed to reflect the latest Microsoft design language. It is used in many Microsoft web applications and is developed in the open. + +We'll talk about: + +- What makes it good +- How to find it +- How to use it +- Laying out Apps with Stack # What Makes It Good diff --git a/step2-02/demo/src/components/TodoFooter.tsx b/step2-02/demo/src/components/TodoFooter.tsx index 6a44d83..083461a 100644 --- a/step2-02/demo/src/components/TodoFooter.tsx +++ b/step2-02/demo/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Stack, Text } from 'office-ui-fabric-react'; interface TodoFooterProps { clear: () => void; diff --git a/step2-02/demo/src/components/TodoHeader.tsx b/step2-02/demo/src/components/TodoHeader.tsx index dec977f..d6029b1 100644 --- a/step2-02/demo/src/components/TodoHeader.tsx +++ b/step2-02/demo/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Stack, Text, Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; import { FilterTypes } from '../store'; interface TodoHeaderProps { diff --git a/step2-03/demo/src/components/TodoFooter.tsx b/step2-03/demo/src/components/TodoFooter.tsx index 6a44d83..083461a 100644 --- a/step2-03/demo/src/components/TodoFooter.tsx +++ b/step2-03/demo/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Stack, Text } from 'office-ui-fabric-react'; interface TodoFooterProps { clear: () => void; diff --git a/step2-03/demo/src/components/TodoHeader.tsx b/step2-03/demo/src/components/TodoHeader.tsx index 9a56b33..ac5a06c 100644 --- a/step2-03/demo/src/components/TodoHeader.tsx +++ b/step2-03/demo/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Stack, Text, Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; import { FilterTypes } from '../store'; interface TodoHeaderProps { diff --git a/step2-03/exercise/src/components/TodoFooter.tsx b/step2-03/exercise/src/components/TodoFooter.tsx index e806563..e9eca5b 100644 --- a/step2-03/exercise/src/components/TodoFooter.tsx +++ b/step2-03/exercise/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Stack, Text } from 'office-ui-fabric-react'; interface TodoFooterProps { clear: () => void; diff --git a/step2-03/exercise/src/components/TodoHeader.tsx b/step2-03/exercise/src/components/TodoHeader.tsx index 7a9cae2..511dc1e 100644 --- a/step2-03/exercise/src/components/TodoHeader.tsx +++ b/step2-03/exercise/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Text, Stack, Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; import { FilterTypes } from '../store'; interface TodoHeaderProps { diff --git a/step2-07/demo/src/components/TodoFooter.tsx b/step2-07/demo/src/components/TodoFooter.tsx index 4bf1f24..38120fa 100644 --- a/step2-07/demo/src/components/TodoFooter.tsx +++ b/step2-07/demo/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { Stack, Text, DefaultButton } from 'office-ui-fabric-react'; import { connect } from 'react-redux'; import { actions } from '../actions'; diff --git a/step2-07/demo/src/components/TodoHeader.tsx b/step2-07/demo/src/components/TodoHeader.tsx index c88342a..56ce281 100644 --- a/step2-07/demo/src/components/TodoHeader.tsx +++ b/step2-07/demo/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Text, Stack, TextField, PrimaryButton } from 'office-ui-fabric-react'; import { Store } from '../store'; import { connect } from 'react-redux'; import { actions } from '../actions'; diff --git a/step2-07/exercise/src/components/TodoFooter.tsx b/step2-07/exercise/src/components/TodoFooter.tsx index 56655f8..71a47b1 100644 --- a/step2-07/exercise/src/components/TodoFooter.tsx +++ b/step2-07/exercise/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Text, Stack } from 'office-ui-fabric-react'; import { connect } from 'react-redux'; import { actions } from '../actions'; diff --git a/step2-07/exercise/src/components/TodoHeader.tsx b/step2-07/exercise/src/components/TodoHeader.tsx index 21a39e5..ff9f329 100644 --- a/step2-07/exercise/src/components/TodoHeader.tsx +++ b/step2-07/exercise/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { TextField, PrimaryButton, Text, Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; import { connect } from 'react-redux'; import { actions } from '../actions'; diff --git a/step2-08/demo/src/components/TodoFooter.tsx b/step2-08/demo/src/components/TodoFooter.tsx index 4bf1f24..16e307b 100644 --- a/step2-08/demo/src/components/TodoFooter.tsx +++ b/step2-08/demo/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Text, Stack } from 'office-ui-fabric-react'; import { connect } from 'react-redux'; import { actions } from '../actions'; diff --git a/step2-08/demo/src/components/TodoHeader.tsx b/step2-08/demo/src/components/TodoHeader.tsx index af9dc77..280baff 100644 --- a/step2-08/demo/src/components/TodoHeader.tsx +++ b/step2-08/demo/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Pivot, PivotItem, TextField, PrimaryButton, Text, Stack } from 'office-ui-fabric-react'; import { FilterTypes, Store } from '../store'; import { actions } from '../actions'; import { connect } from 'react-redux'; diff --git a/step2-08/exercise/src/components/TodoFooter.tsx b/step2-08/exercise/src/components/TodoFooter.tsx index 4bf1f24..16e307b 100644 --- a/step2-08/exercise/src/components/TodoFooter.tsx +++ b/step2-08/exercise/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Text, Stack } from 'office-ui-fabric-react'; import { connect } from 'react-redux'; import { actions } from '../actions'; diff --git a/step2-08/exercise/src/components/TodoHeader.tsx b/step2-08/exercise/src/components/TodoHeader.tsx index af9dc77..04e9aab 100644 --- a/step2-08/exercise/src/components/TodoHeader.tsx +++ b/step2-08/exercise/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Pivot, PivotItem, TextField, PrimaryButton, Stack, Text } from 'office-ui-fabric-react'; import { FilterTypes, Store } from '../store'; import { actions } from '../actions'; import { connect } from 'react-redux'; diff --git a/step2-09/demo/src/components/TodoFooter.tsx b/step2-09/demo/src/components/TodoFooter.tsx index 1a80be6..f69df57 100644 --- a/step2-09/demo/src/components/TodoFooter.tsx +++ b/step2-09/demo/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Text, Stack } from 'office-ui-fabric-react'; import { connect } from 'react-redux'; import { actionsWithService } from '../actions'; diff --git a/step2-09/demo/src/components/TodoHeader.tsx b/step2-09/demo/src/components/TodoHeader.tsx index 9d69117..d2c0b7e 100644 --- a/step2-09/demo/src/components/TodoHeader.tsx +++ b/step2-09/demo/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Pivot, PivotItem, TextField, PrimaryButton, Text, Stack } from 'office-ui-fabric-react'; import { FilterTypes, Store } from '../store'; import { actionsWithService, actions } from '../actions'; import { connect } from 'react-redux'; diff --git a/step2-09/exercise/src/components/TodoFooter.tsx b/step2-09/exercise/src/components/TodoFooter.tsx index 1a80be6..f69df57 100644 --- a/step2-09/exercise/src/components/TodoFooter.tsx +++ b/step2-09/exercise/src/components/TodoFooter.tsx @@ -1,8 +1,6 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; import { Store } from '../store'; -import { DefaultButton } from 'office-ui-fabric-react'; +import { DefaultButton, Text, Stack } from 'office-ui-fabric-react'; import { connect } from 'react-redux'; import { actionsWithService } from '../actions'; diff --git a/step2-09/exercise/src/components/TodoHeader.tsx b/step2-09/exercise/src/components/TodoHeader.tsx index 9d69117..d2c0b7e 100644 --- a/step2-09/exercise/src/components/TodoHeader.tsx +++ b/step2-09/exercise/src/components/TodoHeader.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { Text } from '@uifabric/experiments'; -import { Stack } from 'office-ui-fabric-react'; -import { Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { Pivot, PivotItem, TextField, PrimaryButton, Text, Stack } from 'office-ui-fabric-react'; import { FilterTypes, Store } from '../store'; import { actionsWithService, actions } from '../actions'; import { connect } from 'react-redux';