Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1311 - Remove circular dependency in ClayDropdown #1312

Merged
merged 5 commits into from
Nov 15, 2018
Merged

Fixes #1311 - Remove circular dependency in ClayDropdown #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d1b677
Fixes #1311 - Remove circular dependency
Nov 15, 2018
b2f614c
Fixes #1311 - ClayDropdownItem should not be exported
Nov 15, 2018
c06c161
Fixes #1311 - Add missing item types
Nov 15, 2018
fcb4d2c
Fixes #1311 - Ignore ClayDropdownItem from mcritic
Nov 15, 2018
3e63f94
Fixes #1311 - SF
Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lerna": "lerna bootstrap -- --no-optional --no-package-lock",
"link": "lerna run link",
"lint": "eslint packages/clay-*/src/*.js packages/clay-*/src/**/*.js 'examples/*/src/**/*.js' && npm run mcritic",
"mcritic": "mcritic packages/ --ignore '**/{browserslist-config-clay,clayui.com,generator-metal-clay,node_modules}/**'",
"mcritic": "mcritic packages/ --ignore '**/{browserslist-config-clay,clayui.com,generator-metal-clay,node_modules,ClayDropdownItem.soy}/**'",
"pa11y": "pa11y-ci ./packages/clay-*/demos/a11y.html",
"prettier": "prettier-eslint packages/clay-*/src/*.js packages/clay-*/src/**/*.js 'examples/*/src/**/*.js'",
"soy": "lerna run soy",
Expand Down
1 change: 0 additions & 1 deletion packages/clay-dropdown/src/ClayDropdownItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'clay-checkbox';
import 'clay-icon';
import 'clay-link';
import 'clay-radio';
import './ClayDropdownBase';
import ClayComponent from 'clay-component';
import defineWebComponent from 'metal-web-component';
import Soy from 'metal-soy';
Expand Down
2 changes: 0 additions & 2 deletions packages/clay-dropdown/src/all/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import ClayActionsDropdown from '../ClayActionsDropdown';
import ClayCreationMenuDropdown from '../ClayCreationMenuDropdown';
import ClayDropdownBase from '../ClayDropdownBase';
import ClayDropdownItem from '../ClayDropdownItem';
import ClayDropdown from '../ClayDropdown';

export {
ClayActionsDropdown,
ClayCreationMenuDropdown,
ClayDropdown,
ClayDropdownBase,
ClayDropdownItem,
};
11 changes: 8 additions & 3 deletions packages/clay-dropdown/src/validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ let itemShape = {
maxItems: Config.number(),
separator: Config.bool().value(false),
title: Config.string(),
type: Config.oneOf(['checkbox', 'group', 'item', 'radiogroup']).value(
'item'
),
type: Config.oneOf([
'checkbox',
'group',
'item',
'radio',
'radiogroup',
'separator',
]).value('item'),
};

const itemsValidator = Config.arrayOf(Config.shapeOf(itemShape));
Expand Down