Search is not mandatory in ClayManagementToolbar | Fixes liferay#543

kienD · Feb 21, 2018 · 3ea111e · 3ea111e
1 parent 36d6a11
commit 3ea111e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 22 deletions.
diff --git a/packages/clay-management-toolbar/src/ClayManagementToolbar.js b/packages/clay-management-toolbar/src/ClayManagementToolbar.js
@@ -53,7 +53,7 @@ class ClayManagementToolbar extends Component {
 	 * @private
 	 */
 	handleCloseMobileSearchClick_() {
-		this.showSearch_ = false;
+		this.showSearchMobile_ = false;
 	}
 
 	/**
@@ -88,7 +88,7 @@ class ClayManagementToolbar extends Component {
 	 * @private
 	 */
 	handleOpenMobileSearchClick_() {
-		this.showSearch_ = true;
+		this.showSearchMobile_ = true;
 	}
 
 	/**
@@ -274,14 +274,23 @@ ClayManagementToolbar.STATE = {
 	selectedItems: Config.number(),
 
 	/**
-	 * Flag to indicate if search should be shown in or not. This is for the
+	 * Flag to indicate if search should be shown or not.
+	 * @instance
+	 * @memberof ClayManagementToolbar
+	 * @type {?bool}
+	 * @default true
+	 */
+	showSearch: Config.bool().value(true),
+
+	/**
+	 * Flag to indicate if search should be shown or not. This is for the
 	 * hide/show interaction in small devices.
 	 * @instance
 	 * @memberof ClayManagementToolbar
 	 * @type {?bool}
 	 * @default false
 	 */
-	showSearch_: Config.bool()
+	showSearchMobile_: Config.bool()
 		.internal()
 		.value(false),
 

diff --git a/packages/clay-management-toolbar/src/ClayManagementToolbar.soy b/packages/clay-management-toolbar/src/ClayManagementToolbar.soy
@@ -57,7 +57,8 @@
 	{@param? searchInputName: string}
 	{@param? selectable: bool}
 	{@param? selectedItems: number}
-	{@param? showSearch_: bool}
+	{@param? showSearch: bool}
+	{@param? showSearchMobile_: bool}
 	{@param? sortingOrder: string}
 	{@param? totalItems: number}
 	{@param? viewTypes: list<[
@@ -102,7 +103,8 @@
 			{param searchFormName: $searchFormName /}
 			{param searchInputName: $searchInputName /}
 			{param selectable: $selectable /}
-			{param showSearch_: $showSearch_ /}
+			{param showSearch: $showSearch != false /}
+			{param showSearchMobile_: $showSearchMobile_ /}
 			{param sortingOrder: $sortingOrder /}
 			{param spritemap: $spritemap /}
 			{param viewTypes: $viewTypes /}
@@ -259,7 +261,8 @@
 	{@param? searchFormName: string}
 	{@param? searchInputName: string}
 	{@param? selectable: bool}
-	{@param? showSearch_: bool}
+	{@param? showSearch: bool}
+	{@param? showSearchMobile_: bool}
 	{@param? sortingOrder: string}
 	{@param? viewTypes: list<[
 		active: bool,
@@ -281,7 +284,7 @@
 	{/let}
 
 	<nav {$navAttributes}>
-		{let $onlySearch: not $creationMenu and not $selectable and not $filterItems and not $sortingOrder and not $viewTypes /}
+		{let $onlySearch: $showSearch and not $creationMenu and not $selectable and not $filterItems and not $sortingOrder and not $viewTypes /}
 
 		{let $containerClasses kind="text"}
 			{if $onlySearch}
@@ -350,27 +353,29 @@
 				navbar-form navbar-form-autofit
 				{if not $onlySearch}
 					{sp}navbar-overlay navbar-overlay-sm-down
-					{if $showSearch_}
+					{if $showSearchMobile_}
 						{sp}show
 					{/if}
 				{/if}
 			{/let}
 
-			<div class="{$searchClasses}">
-				{delcall ClayManagementToolbar.SearchForm variant="$contentRenderer"}
-					{param disabled: $disabled /}
-					{param handleCloseMobileSearchClick_: $handleCloseMobileSearchClick_ /}
-					{param handleSearchSearchClick_: $handleSearchSearchClick_ /}
-					{param onlySearch: $onlySearch /}
-					{param searchActionURL: $searchActionURL /}
-					{param searchFormName: $searchFormName /}
-					{param searchInputName: $searchInputName /}
-					{param spritemap: $spritemap /}
-				{/delcall}
-			</div>
+			{if $showSearch}
+				<div class="{$searchClasses}">
+					{delcall ClayManagementToolbar.SearchForm variant="$contentRenderer"}
+						{param disabled: $disabled /}
+						{param handleCloseMobileSearchClick_: $handleCloseMobileSearchClick_ /}
+						{param handleSearchSearchClick_: $handleSearchSearchClick_ /}
+						{param onlySearch: $onlySearch /}
+						{param searchActionURL: $searchActionURL /}
+						{param searchFormName: $searchFormName /}
+						{param searchInputName: $searchInputName /}
+						{param spritemap: $spritemap /}
+					{/delcall}
+				</div>
+			{/if}
 
 			<ul class="navbar-nav">
-				{if not $onlySearch}
+				{if $showSearch and not $onlySearch}
 					<li class="nav-item navbar-breakpoint-d-none">
 						{call ClayButton.render}
 							{param disabled: $disabled /}