Merge pull request #750 from carloslancha/issue-749-improve-creation-…

…menu Improve Creation Menu items logic | Fixes #749
liferay · Mar 16, 2018 · 07f9ad7 · 07f9ad7
2 parents d809d2d + 2c89a92
commit 07f9ad7
Show file tree

Hide file tree

Showing 21 changed files with 2,813 additions and 795 deletions.
diff --git a/packages/clay-dataset-display/demos/a11y.html b/packages/clay-dataset-display/demos/a11y.html
@@ -187,13 +187,17 @@ <h1 class="page-title">
 				],
 				secondaryItems: [
 					{
-						href: '#1',
-						label: 'Add Content 1',
+						items: [
+							{
+								href: '#1',
+								label: 'Add Content 1',
+							},
+							{
+								href: '#2',
+								label: 'Add Content 2',
+							}
+						],
 					},
-					{
-						href: '#2',
-						label: 'Add Content 2',
-					}
 				],
 			},
 			filterItems: [

diff --git a/packages/clay-dataset-display/demos/index.html b/packages/clay-dataset-display/demos/index.html
@@ -187,13 +187,17 @@ <h1 class="page-title">
 				],
 				secondaryItems: [
 					{
-						href: '#1',
-						label: 'Add Content 1',
+						items: [
+							{
+								href: '#1',
+								label: 'Add Content 1',
+							},
+							{
+								href: '#2',
+								label: 'Add Content 2',
+							}
+						],
 					},
-					{
-						href: '#2',
-						label: 'Add Content 2',
-					}
 				],
 			},
 			filterItems: [

diff --git a/packages/clay-dataset-display/src/__tests__/ClayDatasetDisplay.js b/packages/clay-dataset-display/src/__tests__/ClayDatasetDisplay.js
@@ -36,36 +36,40 @@ let creationMenuConfig = {
 	],
 	secondaryItems: [
 		{
-			href: '#fav1',
-			label: 'Favorite 1',
-		},
-		{
-			href: '#fav2',
-			label: 'Favorite 2',
-		},
-		{
-			href: '#fav3',
-			label: 'Favorite 3',
-		},
-		{
-			href: '#fav4',
-			label: 'Favorite 4',
-		},
-		{
-			href: '#fav5',
-			label: 'Favorite 5',
-		},
-		{
-			href: '#fav6',
-			label: 'Favorite 6',
-		},
-		{
-			href: '#fav7',
-			label: 'Favorite 7',
-		},
-		{
-			href: '#fav8',
-			label: 'Favorite 8',
+			items: [
+				{
+					href: '#fav1',
+					label: 'Favorite 1',
+				},
+				{
+					href: '#fav2',
+					label: 'Favorite 2',
+				},
+				{
+					href: '#fav3',
+					label: 'Favorite 3',
+				},
+				{
+					href: '#fav4',
+					label: 'Favorite 4',
+				},
+				{
+					href: '#fav5',
+					label: 'Favorite 5',
+				},
+				{
+					href: '#fav6',
+					label: 'Favorite 6',
+				},
+				{
+					href: '#fav7',
+					label: 'Favorite 7',
+				},
+				{
+					href: '#fav8',
+					label: 'Favorite 8',
+				},
+			],
 		},
 	],
 };

diff --git a/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap b/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap
@@ -688,7 +688,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -1408,7 +1407,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -2128,7 +2126,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -2693,7 +2690,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with grouped item
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -3604,7 +3600,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -4632,7 +4627,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -5506,7 +5500,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -5890,7 +5883,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and se
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>
@@ -7260,7 +7252,6 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it
           <a class=" dropdown-item" href="#2">Add Content 2</a>
         </li>
         <li aria-hidden="true" class="dropdown-divider" role="presentation"></li>
-        <li class="dropdown-subheader" role="presentation">Favorites</li>
         <li>
           <a class=" dropdown-item" href="#fav1">Favorite 1</a>
         </li>