Skip to content

Commit 4b3a60a

Browse files
authored
Merge pull request #3020 from Autodesk/update-side-nav
refactor: update side-nav to point to new @weave-design
2 parents f0ed77b + 192b1b2 commit 4b3a60a

24 files changed

+56
-58
lines changed

deprecated/side-nav/README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
The Side Navigation component provides the highest level navigation tier and allows the user to switch between modules. It also houses secondary and legal/copyright links.
44

5-
Read more about when and how to use the SideNav component [on the internal wiki](https://wiki.autodesk.com/x/S3n2Eg).
6-
75
## Getting started
86

97
```bash
10-
yarn add @hig/side-nav @hig/theme-context @hig/theme-data
8+
yarn add @hig/side-nav @weave-design/theme-context @weave-design/theme-data
119
```
1210

1311
### Import

deprecated/side-nav/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@hig/side-nav",
3-
"version": "3.1.1",
3+
"version": "4.0.1",
44
"description": "HIG SideNav components",
55
"author": "Autodesk Inc.",
66
"license": "Apache-2.0",
@@ -18,13 +18,13 @@
1818
"build/*"
1919
],
2020
"dependencies": {
21-
"@hig/icon-button": "^3.1.0",
22-
"@hig/icons": "^4.1.0",
23-
"@hig/skeleton-item": "^2.1.0",
24-
"@hig/surface": "^2.1.0",
25-
"@hig/text-link": "^2.1.0",
26-
"@hig/typography": "^2.1.0",
27-
"@hig/utils": "^0.4.1",
21+
"@weave-design/icon-button": "^1.0.0",
22+
"@weave-design/icons": "^1.1.0",
23+
"@weave-design/skeleton-item": "^1.0.0",
24+
"@weave-design/surface": "^1.0.0",
25+
"@weave-design/text-link": "^1.0.0",
26+
"@weave-design/typography": "^1.0.0",
27+
"@weave-design/utils": "^1.0.0",
2828
"emotion": "^10.0.0",
2929
"prop-types": "^15.7.1"
3030
},
@@ -36,9 +36,9 @@
3636
"@weave-design/semantic-release-config": "^1.0.0"
3737
},
3838
"peerDependencies": {
39-
"@hig/theme-context": "^4.2.0",
40-
"@hig/theme-data": "^3.4.2",
41-
"react": "^17.0.0"
39+
"@weave-design/theme-context": "^1.0.0",
40+
"@weave-design/theme-data": "^1.3.0",
41+
"react": "^17.0.0 || ^18.0.0"
4242
},
4343
"scripts": {
4444
"build": "weave-scripts-build",

deprecated/side-nav/src/CollapseButton/CollapseButton.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import { CaretDownMUI, CaretDownSUI } from "@hig/icons";
5-
import ThemeContext from "@hig/theme-context";
6-
import { memoizeCreateButtonEventHandlers } from "@hig/utils";
4+
import { CaretDownMUI, CaretDownSUI } from "@weave-design/icons";
5+
import ThemeContext from "@weave-design/theme-context";
6+
import { memoizeCreateButtonEventHandlers } from "@weave-design/utils";
77
import stylesheet from "./stylesheet";
88

99
/**

deprecated/side-nav/src/Group/Group.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import ThemeContext from "@hig/theme-context";
5-
import { createCustomClassNames } from "@hig/utils";
4+
import ThemeContext from "@weave-design/theme-context";
5+
import { createCustomClassNames } from "@weave-design/utils";
66
import stylesheet from "./stylesheet";
77

88
export default class Group extends Component {

deprecated/side-nav/src/Link/Link.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
3-
import { sizes as iconSizes } from "@hig/icons";
4-
import ThemeContext from "@hig/theme-context";
5-
import Typography from "@hig/typography";
6-
import { createCustomClassNames } from "@hig/utils";
3+
import { sizes as iconSizes } from "@weave-design/icons";
4+
import ThemeContext from "@weave-design/theme-context";
5+
import Typography from "@weave-design/typography";
6+
import { createCustomClassNames } from "@weave-design/utils";
77
import { css, cx } from "emotion";
88

99
import { AVAILABLE_TARGETS } from "../targets";

deprecated/side-nav/src/Module/presenters/ModuleCompactPresenter.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import ThemeContext from "@hig/theme-context";
4+
import ThemeContext from "@weave-design/theme-context";
55
import {
66
createCustomClassNames,
77
memoizeCreateButtonEventHandlers,
8-
} from "@hig/utils";
8+
} from "@weave-design/utils";
99
import stylesheet from "./stylesheet";
1010

1111
export default class ModuleCompact extends Component {

deprecated/side-nav/src/Module/presenters/ModuleCompactPresenter.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { Collaboration24 } from "@hig/icons";
2+
import { Collaboration24 } from "@weave-design/icons";
33
import { takeSnapshotsOf } from "@weave-design/jest-preset/helpers";
44

55
import ModuleCompactPresenter from "./ModuleCompactPresenter";

deprecated/side-nav/src/Module/presenters/ModulePresenter.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import ThemeContext from "@hig/theme-context";
5-
import { createCustomClassNames } from "@hig/utils";
4+
import ThemeContext from "@weave-design/theme-context";
5+
import { createCustomClassNames } from "@weave-design/utils";
66

77
import CollapseButton from "../../CollapseButton";
88
import TitlePresenter from "./TitlePresenter";

deprecated/side-nav/src/Module/presenters/TitlePresenter.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
44

5-
import { sizes as iconSizes } from "@hig/icons";
6-
import ThemeContext from "@hig/theme-context";
5+
import { sizes as iconSizes } from "@weave-design/icons";
6+
import ThemeContext from "@weave-design/theme-context";
77
import {
88
createCustomClassNames,
99
memoizeCreateButtonEventHandlers,
10-
} from "@hig/utils";
10+
} from "@weave-design/utils";
1111

1212
import { targets, AVAILABLE_TARGETS } from "../../targets";
1313
import ExternalLinkIcon from "../../presenters/ExternalLinkIcon";

deprecated/side-nav/src/Search/Search.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React, { useState, useEffect } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import ThemeContext from "@hig/theme-context";
5-
import { Search24, CloseLUI } from "@hig/icons";
4+
import ThemeContext from "@weave-design/theme-context";
5+
import { Search24, CloseLUI } from "@weave-design/icons";
66
import {
77
createCustomClassNames,
88
memoizeCreateButtonEventHandlers,
9-
} from "@hig/utils";
9+
} from "@weave-design/utils";
1010
import stylesheet from "./stylesheet";
1111

1212
const Search = (props) => {

deprecated/side-nav/src/SideNavSkeleton/SideNavSkeleton.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import SkeletonItem from "@hig/skeleton-item";
4+
import SkeletonItem from "@weave-design/skeleton-item";
55
import stylesheet from "./stylesheet";
66

77
const skeletonItemStyles = Object.freeze([

deprecated/side-nav/src/Submodule/Submodule.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import { sizes as iconSizes } from "@hig/icons";
5-
import ThemeContext from "@hig/theme-context";
4+
import { sizes as iconSizes } from "@weave-design/icons";
5+
import ThemeContext from "@weave-design/theme-context";
66
import {
77
createCustomClassNames,
88
memoizeCreateButtonEventHandlers,
9-
} from "@hig/utils";
9+
} from "@weave-design/utils";
1010

1111
import { AVAILABLE_TARGETS, targets } from "../targets";
1212
import ExternalLinkIcon from "../presenters/ExternalLinkIcon";

deprecated/side-nav/src/__stories__/ExampleSideNav.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
2-
import { Graph24, ProductsAndServices24, Collaboration24 } from "@hig/icons";
3-
import Typography from "@hig/typography";
2+
import { Graph24, ProductsAndServices24, Collaboration24 } from "@weave-design/icons";
3+
import Typography from "@weave-design/typography";
44

55
import SideNav from "../index";
66

deprecated/side-nav/src/__stories__/SideNavCompact.story.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { ArgsTable, Primary, Stories } from "@storybook/addon-docs";
3-
import { Collaboration24, Graph24, ProductsAndServices24 } from "@hig/icons";
3+
import { Collaboration24, Graph24, ProductsAndServices24 } from "@weave-design/icons";
44

55
import SideNav, { BelowTopNavCompact } from "../index";
66
import Readme from "../../README.md";

deprecated/side-nav/src/__stories__/SideNavContainer.story.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { ArgsTable, Primary, Stories } from "@storybook/addon-docs";
3-
import Surface from "@hig/surface";
3+
import Surface from "@weave-design/surface";
44

55
import SideNav, { BelowTopNavCompact, Docked } from "../index";
66
import ExampleSideNav from "./ExampleSideNav";

deprecated/side-nav/src/__stories__/SideNavModule.story.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { ArgsTable, Primary, Stories } from "@storybook/addon-docs";
3-
import { Graph24 } from "@hig/icons";
3+
import { Graph24 } from "@weave-designweave-design/icons";
44

55
import SideNav from "../index";
66
import Readme from "../../README.md";

deprecated/side-nav/src/__stories__/SideNavModuleCompact.story.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { ArgsTable, Primary, Stories } from "@storybook/addon-docs";
3-
import { Graph24 } from "@hig/icons";
3+
import { Graph24 } from "@weave-design/icons";
44

55
import SideNav from "../index";
66
import Readme from "../../README.md";

deprecated/side-nav/src/__stories__/SideNavModuleGroup.story.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { ArgsTable, Primary, Stories } from "@storybook/addon-docs";
3-
import { Collaboration24, Graph24, ProductsAndServices24 } from "@hig/icons";
3+
import { Collaboration24, Graph24, ProductsAndServices24 } from "@weave-design/icons";
44

55
import SideNav from "../index";
66
import Readme from "../../README.md";

deprecated/side-nav/src/containers/BelowTopNav.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
3-
import Surface from "@hig/surface";
4-
import ThemeContext from "@hig/theme-context";
3+
import Surface from "@weave-design/surface";
4+
import ThemeContext from "@weave-design/theme-context";
55
import stylesheet from "./stylesheet";
66

77
export default class BelowTopNav extends Component {

deprecated/side-nav/src/containers/BelowTopNavCompact.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
3-
import Surface from "@hig/surface";
4-
import ThemeContext from "@hig/theme-context";
3+
import Surface from "@weave-design/surface";
4+
import ThemeContext from "@weave-design/theme-context";
55
import stylesheet from "./stylesheet";
66

77
export default class BelowTopNavCompact extends Component {

deprecated/side-nav/src/containers/Docked.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import ThemeContext from "@hig/theme-context";
4+
import ThemeContext from "@weave-design/theme-context";
55
import stylesheet from "./stylesheet";
66

77
export default class Docked extends Component {

deprecated/side-nav/src/presenters/ExternalLinkIcon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
3-
import { ExternalLink16, ExternalLink24, sizes as iconSizes } from "@hig/icons";
3+
import { ExternalLink16, ExternalLink24, sizes as iconSizes } from "@weave-design/icons";
44

55
export default class ExternalLinkIcon extends Component {
66
// eslint-disable-next-line react/static-property-placement

deprecated/side-nav/src/presenters/ExternalLinkIcon.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { shallow } from "enzyme";
22
import React from "react";
3-
import { ExternalLink16, ExternalLink24, sizes as iconSizes } from "@hig/icons";
3+
import { ExternalLink16, ExternalLink24, sizes as iconSizes } from "@weave-design/icons";
44

55
import ExternalLinkIcon from "./ExternalLinkIcon";
66

deprecated/side-nav/src/presenters/SideNav.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { css, cx } from "emotion";
4-
import { ThemeContext } from "@hig/theme-context";
5-
import { Back24, Back16 } from "@hig/icons";
6-
import Typography from "@hig/typography";
7-
import TextLink from "@hig/text-link";
8-
import IconButton from "@hig/icon-button";
9-
import { createCustomClassNames } from "@hig/utils";
4+
import { ThemeContext } from "@weave-design/theme-context";
5+
import { Back24, Back16 } from "@weave-design/icons";
6+
import Typography from "@weave-design/typography";
7+
import TextLink from "@weave-design/text-link";
8+
import IconButton from "@weave-design/icon-button";
9+
import { createCustomClassNames } from "@weave-design/utils";
1010

1111
import stylesheet from "./stylesheet";
1212

0 commit comments

Comments
 (0)