Merge pull request #414 from carloslancha/SoyFixes

Empty string for contentRenderers are mandatory to make it work in java
liferay · Jan 16, 2018 · cc82deb · cc82deb
2 parents d0f2148 + 999584f
commit cc82deb
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 18 deletions.
diff --git a/packages/clay-card/src/ClayCard.soy b/packages/clay-card/src/ClayCard.soy
@@ -9,7 +9,7 @@
 		href: string,
 		label: string,
 		separator: bool
-	]> | ?}
+	]>}
 	{@param? contentRenderer: string}
 	{@param? disabled: bool}
 	{@param? elementClasses: string}
@@ -49,8 +49,10 @@
 		{/if}
 	{/let}
 
+	{let $variant: $contentRenderer ?: '' /}
+
 	{let $descriptiveArea kind="html"}
-		{delcall ClayCard.DescriptiveArea variant="$contentRenderer"}
+		{delcall ClayCard.DescriptiveArea variant="$variant"}
 			{param actionItems: $actionItems /}
 			{param href: $href /}
 			{param labels: $labels /}
@@ -62,7 +64,7 @@
 	{/let}
 
 	{let $visualArea kind="html"}
-		{delcall ClayCard.VisualArea variant="$contentRenderer"}
+		{delcall ClayCard.VisualArea variant="$variant"}
 			{param fileType: $fileType /}
 			{param fileTypeStyle: $fileTypeStyle /}
 			{param icon: $icon /}
@@ -111,7 +113,7 @@
 		href: string,
 		label: string,
 		separator: bool
-	]> | ?}
+	]>}
 	{@param? href: string}
 	{@param? labels: list<?>}
 	{@param? labelStylesMap: ?}

diff --git a/packages/clay-card/src/ClayFileCard.soy b/packages/clay-card/src/ClayFileCard.soy
@@ -10,7 +10,7 @@
         href: string,
         label: string,
         separator: bool
-    ]> | ?}
+    ]>}
     {@param? disabled: bool}
     {@param? elementClasses: string}
     {@param? fileType: string}

diff --git a/packages/clay-card/src/ClayHorizontalCard.soy b/packages/clay-card/src/ClayHorizontalCard.soy
@@ -10,7 +10,7 @@
 		href: string,
 		label: string,
 		separator: bool
-	]> | ?}
+	]>}
 	{@param? disabled: bool}
 	{@param? elementClasses: string}
 	{@param? groupName: string}
@@ -83,7 +83,7 @@
 		href: string,
 		label: string,
 		separator: bool
-	]> | ?}
+	]>}
 	{@param? href: string}
 	{@param? icon: string}
 

diff --git a/packages/clay-card/src/ClayImageCard.soy b/packages/clay-card/src/ClayImageCard.soy
@@ -9,7 +9,7 @@
         href: string,
         label: string,
         separator: bool
-    ]> | ?}
+    ]>}
     {@param? disabled: bool}
     {@param? elementClasses: string}
     {@param? fileType: string}

diff --git a/packages/clay-card/src/ClayUserCard.soy b/packages/clay-card/src/ClayUserCard.soy
@@ -9,7 +9,7 @@
         href: string,
         label: string,
         separator: bool
-    ]> | ?}
+    ]>}
     {@param? disabled: bool}
     {@param? elementClasses: string}
     {@param? groupName: string}
@@ -67,7 +67,7 @@
     	href: string,
     	label: string,
     	separator: bool
-    ]> | ?}
+    ]>}
     {@param? href: string}
     {@param? labels: list<?>}
     {@param? labelStylesMap: ?}

diff --git a/packages/clay-card/src/action_items_validator.js b/packages/clay-card/src/action_items_validator.js
@@ -9,10 +9,7 @@ let actionItemShape = {
 	type: Config.oneOf(['group', 'item']).value('item'),
 };
 
-const actionItemsValidator = Config.oneOfType([
-	Config.arrayOf(Config.shapeOf(actionItemShape)),
-	Config.object(),
-]);
+const actionItemsValidator = Config.arrayOf(Config.shapeOf(actionItemShape));
 
 actionItemShape.items = actionItemsValidator;
 

diff --git a/packages/clay-dataset-display/src/ClayDatasetDisplay.soy b/packages/clay-dataset-display/src/ClayDatasetDisplay.soy
@@ -13,7 +13,7 @@
 		quickAction: bool,
 		separator: bool,
 		type: string
-	]> | ?}
+	]>}
 	{@param? creationMenu: [
 		button: ?,
 		caption: string,
@@ -112,7 +112,7 @@
 			{/call}
 
 			{if $views and isNonnull($selectedView)}
-				{let $variant: $views[$selectedView].contentRenderer /}
+				{let $variant: $views[$selectedView].contentRenderer ?: '' /}
 
 				{delcall ClayDatasetDisplay.List variant="$variant"}
 					{param handleItemToggled_: $handleItemToggled_ /}

diff --git a/packages/clay-dropdown/src/ClayDropdownBase.soy b/packages/clay-dropdown/src/ClayDropdownBase.soy
@@ -49,7 +49,7 @@
 		{call .sections}
 			{param button: $button /}
 			{param caption: $caption /}
-			{param contentRenderer: $contentRenderer /}
+			{param contentRenderer: $contentRenderer ?: '' /}
 			{param expanded: $expanded /}
 			{param handleButtonClick_: $handleButtonClick_ /}
 			{param handleItemClick_: $handleItemClick_ /}

diff --git a/packages/clay-management-toolbar/src/ClayManagementToolbar.soy b/packages/clay-management-toolbar/src/ClayManagementToolbar.soy
@@ -83,7 +83,7 @@
 		{/call}
 	{else}
 		{call .default}
-			{param contentRenderer: $contentRenderer /}
+			{param contentRenderer: $contentRenderer ?: '' /}
 			{param creationMenu: $creationMenu /}
 			{param elementClasses: $elementClasses /}
 			{param filterItems: $filterItems /}