From 68567569aa6051bb3f593641c4cf2dd6c869351a Mon Sep 17 00:00:00 2001
From: leuryr <leuryr@yahoo.com>
Date: Tue, 26 Jan 2021 15:54:37 -0500
Subject: [PATCH] Add dropdown for search options

---
 .../BlockSettingsView.jsx                     |  98 ++++++------
 .../ChooseDefaultSearchConstants.js           |   1 +
 .../ChooseDefaultSearchView.jsx               | 144 ++++++++++++++++--
 .../ChooseDefaultSearchView.scss              | 104 ++++++++++++-
 .../dropdown-caret.svg                        |   7 +
 5 files changed, 290 insertions(+), 64 deletions(-)
 create mode 100644 app/images/hub/ChooseDefaultSearchView/dropdown-caret.svg

diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
index 0eca9aa0e..c4691c26b 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
@@ -160,65 +160,65 @@ class BlockSettingsView extends Component {
 										<Tooltip header={t('ghostery_dawn_onboarding_info_blocking_all')} position="top" delay="300" isOnboardingHub />
 									</div>
 								</div>
-								<div className="BlockSettingsView_answerBlock">
-									<div className="BlockSettingsView__radioButtonContainer">
-										<RadioButton checked={kindsOfTrackers === 0} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 0)} altDesign />
-									</div>
-									<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_all')}</div>
+							</li>
+							<div className="BlockSettingsView_answerBlock">
+								<div className="BlockSettingsView__radioButtonContainer">
+									<RadioButton checked={kindsOfTrackers === 0} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 0)} altDesign />
 								</div>
-								<div className="BlockSettingsView_answerBlock">
-									<div className="BlockSettingsView__radioButtonContainer">
-										<RadioButton checked={kindsOfTrackers === 1} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 1)} altDesign />
-									</div>
-									<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_ad_and_analytics')}</div>
+								<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_all')}</div>
+							</div>
+							<div className="BlockSettingsView_answerBlock">
+								<div className="BlockSettingsView__radioButtonContainer">
+									<RadioButton checked={kindsOfTrackers === 1} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 1)} altDesign />
 								</div>
-								<div className="BlockSettingsView_answerBlock">
-									<div className="BlockSettingsView__radioButtonContainer">
-										<RadioButton checked={kindsOfTrackers === 2} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 2)} altDesign />
-									</div>
-									<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_none')}</div>
+								<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_ad_and_analytics')}</div>
+							</div>
+							<div className="BlockSettingsView_answerBlock">
+								<div className="BlockSettingsView__radioButtonContainer">
+									<RadioButton checked={kindsOfTrackers === 2} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 2)} altDesign />
 								</div>
-								<li className="BlockSettingsView_question">
-									<div className="BlockSettingsView_questionBlock">
-										{t('ghostery_dawn_onboarding_question_anti_tracking')}
-										<div className="BlockSettingsView__infoIcon g-tooltip">
-											<Tooltip header={t('ghostery_dawn_onboarding_info_anti_tracking')} position="top" delay="300" isOnboardingHub />
-										</div>
-									</div>
-								</li>
-								<div className="BlockSettingsView_answerBlock">
-									<div className="BlockSettingsView__radioButtonContainer">
-										<RadioButton checked={antiTracking === true} handleClick={() => this.handleAnswerChange('antiTracking', true)} altDesign />
+								<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_none')}</div>
+							</div>
+							<li className="BlockSettingsView_question">
+								<div className="BlockSettingsView_questionBlock">
+									{t('ghostery_dawn_onboarding_question_anti_tracking')}
+									<div className="BlockSettingsView__infoIcon g-tooltip">
+										<Tooltip header={t('ghostery_dawn_onboarding_info_anti_tracking')} position="top" delay="300" isOnboardingHub />
 									</div>
-									<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_yes')}</div>
 								</div>
-								<div className="BlockSettingsView_answerBlock">
-									<div className="BlockSettingsView__radioButtonContainer">
-										<RadioButton checked={antiTracking === false} handleClick={() => this.handleAnswerChange('antiTracking', false)} altDesign />
-									</div>
-									<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_no')}</div>
+							</li>
+							<div className="BlockSettingsView_answerBlock">
+								<div className="BlockSettingsView__radioButtonContainer">
+									<RadioButton checked={antiTracking === true} handleClick={() => this.handleAnswerChange('antiTracking', true)} altDesign />
 								</div>
-								<li className="BlockSettingsView_question">
-									<div className="BlockSettingsView_questionBlock">
-										{t('ghostery_dawn_onboarding_question_smart_browsing')}
-										<div className="BlockSettingsView__infoIcon g-tooltip">
-											<Tooltip header={t('ghostery_dawn_onboarding_info_smart_browsing')} position="top" delay="300" isOnboardingHub />
-										</div>
-									</div>
-								</li>
-								<div className="BlockSettingsView_answerBlock">
-									<div className="BlockSettingsView__radioButtonContainer">
-										<RadioButton checked={smartBrowsing === true} handleClick={() => this.handleAnswerChange('smartBrowsing', true)} altDesign />
-									</div>
-									<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_yes')}</div>
+								<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_yes')}</div>
+							</div>
+							<div className="BlockSettingsView_answerBlock">
+								<div className="BlockSettingsView__radioButtonContainer">
+									<RadioButton checked={antiTracking === false} handleClick={() => this.handleAnswerChange('antiTracking', false)} altDesign />
 								</div>
-								<div className="BlockSettingsView_answerBlock">
-									<div className="BlockSettingsView__radioButtonContainer">
-										<RadioButton checked={smartBrowsing === false} handleClick={() => this.handleAnswerChange('smartBrowsing', false)} altDesign />
+								<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_no')}</div>
+							</div>
+							<li className="BlockSettingsView_question">
+								<div className="BlockSettingsView_questionBlock">
+									{t('ghostery_dawn_onboarding_question_smart_browsing')}
+									<div className="BlockSettingsView__infoIcon g-tooltip">
+										<Tooltip header={t('ghostery_dawn_onboarding_info_smart_browsing')} position="top" delay="300" isOnboardingHub />
 									</div>
-									<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_no')}</div>
 								</div>
 							</li>
+							<div className="BlockSettingsView_answerBlock">
+								<div className="BlockSettingsView__radioButtonContainer">
+									<RadioButton checked={smartBrowsing === true} handleClick={() => this.handleAnswerChange('smartBrowsing', true)} altDesign />
+								</div>
+								<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_yes')}</div>
+							</div>
+							<div className="BlockSettingsView_answerBlock">
+								<div className="BlockSettingsView__radioButtonContainer">
+									<RadioButton checked={smartBrowsing === false} handleClick={() => this.handleAnswerChange('smartBrowsing', false)} altDesign />
+								</div>
+								<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_no')}</div>
+							</div>
 						</ol>
 					</div>
 					<button
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js b/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js
index 874dfcb5e..e1cbe5caf 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js
@@ -16,3 +16,4 @@ export const SEARCH_GHOSTERY = 'Ghostery';
 export const SEARCH_BING = 'Bing';
 export const SEARCH_YAHOO = 'Yahoo';
 export const SEARCH_STARTPAGE = 'Startpage';
+export const SEARCH_OTHER = t('ghostery_dawn_onboarding_other');
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
index 5288a70fd..eb128a4ad 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
@@ -20,7 +20,8 @@ import {
 	SEARCH_GHOSTERY,
 	SEARCH_YAHOO,
 	SEARCH_STARTPAGE,
-	SEARCH_BING
+	SEARCH_BING,
+	SEARCH_OTHER
 } from './ChooseDefaultSearchConstants';
 import { Modal } from '../../../../shared-components';
 
@@ -31,10 +32,20 @@ class ChooseDefaultSearchView extends Component {
 		this.state = {
 			chosenSearch: SEARCH_GHOSTERY,
 			searchBeingConsidered: null,
+			otherSearchSelected: null,
+			otherListOpen: false,
 			modalActive: false,
 		};
 	}
 
+	componentDidMount() {
+		document.addEventListener('click', this.handleClickAway);
+	}
+
+	componentWillUnmount() {
+		document.removeEventListener('click', this.handleClickAway);
+	}
+
 	updateSelection = () => this.setState(prevState => (
 		{
 			chosenSearch: prevState.searchBeingConsidered,
@@ -45,13 +56,33 @@ class ChooseDefaultSearchView extends Component {
 
 	cancelSelection = () => this.setState({ modalActive: false, searchBeingConsidered: null });
 
+	updateOtherSearchSelection = otherSelected => this.setState({ otherSearchSelected: otherSelected });
+
+	updateOtherListOpen = open => this.setState({ otherListOpen: open });
+
 	triggerConfirmationModal = selection => this.setState({ modalActive: true, searchBeingConsidered: selection });
 
+	handleClickAway = (e) => {
+		const { otherListOpen } = this.state;
+
+		const closeDropdownOnClickAway = (open, key, ref) => {
+			if (open && !ref.contains(e.target)) {
+				this.setState({ [`${key}`]: false });
+			}
+		};
+		closeDropdownOnClickAway(otherListOpen, 'otherListOpen', this.otherListRef);
+	}
+
 	handleSubmit = () => {
-		const { chosenSearch } = this.state;
+		let { chosenSearch } = this.state;
+		const { otherSearchSelected } = this.state;
 		const { actions, history } = this.props;
 		const { setSetupStep, setDefaultSearch } = actions;
 
+		if (chosenSearch === SEARCH_OTHER && otherSearchSelected) {
+			chosenSearch = otherSearchSelected;
+		}
+
 		// TODO comment this IN for builds for Dawn
 		// commented out for testing purposes, as trying to message search@ghostery.com
 		// outside of Dawn causes an error
@@ -82,7 +113,68 @@ class ChooseDefaultSearchView extends Component {
 
 	renderStartpageOptionDescription = () => (
 		<div className="ChooseSearchView__optionDescriptionTitle">{t('ghostery_dawn_onboarding_ad_supported_private_search')}</div>
-	)
+	);
+
+	renderOtherOptionDescription = () => {
+		const { otherSearchSelected, otherListOpen } = this.state;
+		const dropdownOpen = otherListOpen ? 'expanded' : '';
+		return (
+			<Fragment>
+				<div className="ChooseSearchView__optionDescriptionHeader">
+					<div className="ChooseSearchView__optionTitle">{SEARCH_OTHER}</div>
+					<div className="ChooseSearchView__optionDescriptionSubtitle">{t('ghostery_dawn_onboarding_choose_alternate_search')}</div>
+				</div>
+				<div
+					ref={(node) => { this.otherListRef = node; }}
+					className={`ChooseSearchView__optionDropdownContainer ${dropdownOpen}`}
+					onClick={() => this.updateOtherListOpen(!otherListOpen)}
+				>
+					<div className="ChooseSearchView__optionDropdown">
+						<div className="ChooseSearchView__optionDropdownItem">
+							{otherSearchSelected || t('ghostery_dawn_onboarding_select_option')}
+							<img
+								className={`ChooseSearchView__optionDropdownCaret ${dropdownOpen}`}
+								src="/app/images/hub/ChooseDefaultSearchView/dropdown-caret.svg"
+							/>
+						</div>
+						{otherListOpen && this.renderOtherOptionsList()}
+					</div>
+				</div>
+			</Fragment>
+		);
+	}
+
+	renderOtherOptionsList = () => {
+		const otherSearchOptions = [
+			'DuckDuck Go',
+			'Ecosia',
+			'Ekoru',
+			'Gibiru',
+			'Google',
+			'OneSearch',
+			'Privado',
+			'Qwant',
+			'Search Encrypt',
+			'Tailcat',
+		];
+
+		return (
+			<Fragment>
+				{otherSearchOptions.map(otherSearchOption => (
+					<div
+						key={`option-${otherSearchOption}`}
+						className="ChooseSearchView__optionDropdownItem"
+						onClick={() => {
+							this.updateOtherSearchSelection(otherSearchOption);
+							this.triggerConfirmationModal(SEARCH_OTHER);
+						}}
+					>
+						{otherSearchOption}
+					</div>
+				))}
+			</Fragment>
+		);
+	}
 
 	renderOptionContainer = (chosenSearch, optionName) => {
 		const selected = (chosenSearch === optionName);
@@ -90,25 +182,38 @@ class ChooseDefaultSearchView extends Component {
 		const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${optionName.toLocaleLowerCase()}.svg`;
 
 		return (
-			<div onClick={() => this.triggerConfirmationModal(optionName)} className={containerClasses}>
+			<div
+				onClick={() => {
+					if (optionName !== SEARCH_OTHER) {
+						this.triggerConfirmationModal(optionName);
+					}
+				}}
+				className={containerClasses}
+			>
 				<div className="ChooseSearchView__optionRadioButtonContainer">
-					<RadioButton
-						checked={selected}
-						handleClick={() => {}}
-						altDesign
-					/>
+					{(optionName !== SEARCH_OTHER || (optionName === SEARCH_OTHER && selected)) && (
+						<RadioButton
+							checked={selected}
+							handleClick={() => {}}
+							altDesign
+						/>
+					)
+					}
 				</div>
 				<div className="ChooseSearchView__optionDescriptionContainer">
-					<img src={logoFilename} />
+					{(optionName !== SEARCH_OTHER) && (
+						<img src={logoFilename} />
+					)}
 					{(optionName === SEARCH_GHOSTERY) && this.renderGhosteryOptionDescription()}
 					{(optionName === SEARCH_STARTPAGE) && this.renderStartpageOptionDescription()}
+					{(optionName === SEARCH_OTHER) && this.renderOtherOptionDescription()}
 				</div>
 			</div>
 		);
 	}
 
 	renderConfirmationModal = () => {
-		const { searchBeingConsidered } = this.state;
+		const { searchBeingConsidered, otherSearchSelected } = this.state;
 		const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${searchBeingConsidered.toLocaleLowerCase()}.svg`;
 
 		return (
@@ -116,12 +221,26 @@ class ChooseDefaultSearchView extends Component {
 				<div className="ChooseSearchView__modalContent">
 					<img src="/app/images/hub/ChooseDefaultSearchView/ghostery-browser-logo.svg" />
 					<div className="ChooseSearchView__modalMain">
-						<img className="ChooseSearchView__modalOptionLogo" src={logoFilename} />
+						{searchBeingConsidered === SEARCH_OTHER ? (
+							<div className="ChooseSearchView__modalHeader">
+								{SEARCH_OTHER}
+							</div>
+						) :
+							<img className="ChooseSearchView__modalOptionLogo" src={logoFilename} />
+						}
 						<div className="ChooseSearchView__modalDescription">
 							{searchBeingConsidered === SEARCH_STARTPAGE && t('ghostery_dawn_onboarding_startpage_warning')}
 							{searchBeingConsidered === SEARCH_BING && t('ghostery_dawn_onboarding_bing_warning')}
 							{searchBeingConsidered === SEARCH_YAHOO && t('ghostery_dawn_onboarding_yahoo_warning')}
 							{searchBeingConsidered === SEARCH_GHOSTERY && t('ghostery_dawn_onboarding_glow_benefit')}
+							{(searchBeingConsidered === SEARCH_OTHER) && (
+								<Fragment>
+									{
+										`${t('ghostery_dawn_onboarding_you_have_selected_an_alternate_serach_engine')} \n
+										${otherSearchSelected}`
+									}
+								</Fragment>
+							)}
 						</div>
 						<div className="ChooseSearchView__modalButtonsContainer">
 							<button
@@ -167,6 +286,7 @@ class ChooseDefaultSearchView extends Component {
 						{this.renderOptionContainer(chosenSearch, SEARCH_GHOSTERY)}
 						{this.renderOptionContainer(chosenSearch, SEARCH_STARTPAGE)}
 						{this.renderOptionContainer(chosenSearch, SEARCH_BING)}
+						{this.renderOptionContainer(chosenSearch, SEARCH_OTHER)}
 						{this.renderOptionContainer(chosenSearch, SEARCH_YAHOO)}
 					</div>
 					<button
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.scss b/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.scss
index 03138388a..c0d9011f5 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.scss
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.scss
@@ -75,11 +75,24 @@
 
   &.selected {
 	border: solid 4px $ghosty-blue;
+
+		& .ChooseSearchView__optionDropdownContainer {
+			top: 7px;
+		}
   }
 
   &:hover {
 	border: solid 4px $ghosty-blue;
-  }
+
+		& .ChooseSearchView__optionDropdownContainer {
+			top: 7px;
+		}
+	}
+
+	& .ChooseSearchView__optionDropdownContainer {
+		top: 10px;
+	}
+
 }
 
 .ChooseSearchView__optionRadioButtonContainer {
@@ -90,6 +103,7 @@
 }
 
 .ChooseSearchView__optionDescriptionContainer {
+	position: relative;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -98,8 +112,26 @@
 	padding-right: 15%;
 }
 
+.ChooseSearchView__optionDescriptionHeader {
+	position: absolute;
+	margin-top: -45px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+@mixin option-font {
+  line-height: 0.8;
+  font-size: 16px;
+  font-weight: 500;
+}
+.ChooseSearchView__optionTitle {
+	@include option-font;
+}
+
 .ChooseSearchView__optionDescriptionTitle {
-  padding-top: 10px;
+	padding-top: 10px;
   line-height: 0.8;
   font-size: 14px;
   font-weight: 500;
@@ -109,6 +141,65 @@
   font-size: 14px;
 }
 
+.ChooseSearchView__optionDropdownContainer {
+	position: absolute;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	margin-top: 50px;
+	width: 184px;
+  height: 50px;
+  border-radius: 4px;
+	border: solid 2px #4a4a4a;
+	background-color: rgba(255, 255, 255, 0.95);
+
+	&.expanded {
+		height: 330px;
+	}
+
+	&:hover {
+		border-color: #00aef0
+	}
+}
+
+.ChooseSearchView__optionDropdown {
+	position: absolute;
+	top: 18px;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.ChooseSearchView__optionDropdownCaret {
+	position: relative;
+	left: 18px;
+	&.expanded {
+		transform: rotate(180deg);
+	}
+}
+
+.ChooseSearchView__optionDropdownItem {
+	@include option-font;
+	margin-bottom: 16px;
+	&:hover {
+		color: #00aef0;
+		text-decoration: underline;
+	}
+}
+
+.ChooseSearchView__caret {
+	height: 35px;
+	width: 25px;
+	padding-top: 21px;
+	padding-right: 0;
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-size: 9px 5px;
+	background-image: buildIconCaretDown(#4a4a4a);
+}
+
 .ChooseSearchView__nextButton {
   display: flex;
   justify-content: center;
@@ -211,7 +302,8 @@
   text-align: center;
   color: $tundora;
   width: 70%;
-  margin-bottom: 113px;
+	margin-bottom: 113px;
+	white-space: pre-line;
 }
 
 .ChooseSearchView__modalContent {
@@ -229,3 +321,9 @@
   flex-direction: column;
   align-items: center;
 }
+
+.ChooseSearchView__modalHeader {
+	font-size: 48px;
+	font-weight: 500;
+	margin-bottom: 110px;
+}
diff --git a/app/images/hub/ChooseDefaultSearchView/dropdown-caret.svg b/app/images/hub/ChooseDefaultSearchView/dropdown-caret.svg
new file mode 100644
index 000000000..d0ce33f4d
--- /dev/null
+++ b/app/images/hub/ChooseDefaultSearchView/dropdown-caret.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="11" viewBox="0 0 16 11">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#4A4A4A" stroke="#4A4A4A" stroke-width=".614">
+            <path d="M772 484L779 494 765 494z" transform="translate(-764 -483) matrix(1 0 0 -1 0 978)"/>
+        </g>
+    </g>
+</svg>