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

Press 2 470 Improve Social Media capture UI #140

Merged
merged 4 commits into from
Jan 4, 2023
Merged

Press 2 470 Improve Social Media capture UI #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fca8f20
Added New CSS and Toggle feature
officiallygod Dec 21, 2022
b358103
Review Comments
officiallygod Dec 26, 2022
5ff64a1
Replaced with MAP
officiallygod Jan 2, 2023
11f4983
Fixed a Error
officiallygod Jan 2, 2023
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
17 changes: 9 additions & 8 deletions src/OnboardingSPA/components/MiniPreview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { translations } from '../../utils/locales/translations';
*
* @returns
*/
const MiniPreview = ({ title, desc, icon, socialData }) => {
const MiniPreview = ({ title, desc, icon, socialData, isSocialFormOpen, setIsSocialFormOpen }) => {

var iconPreview = icon == "" || icon == undefined ? content.icon : icon;
var titlePreview = title == "" ? sprintf(__(content.title, 'wp-module-onboarding'), translations('Site')) : title;
Expand Down Expand Up @@ -70,13 +70,14 @@ const MiniPreview = ({ title, desc, icon, socialData }) => {
}

function socialIconList() {
var socialIconList = []
socialDataset.map( (socialInfo) => {
!socialInfo.url ||
socialIconList.push(
<div key={socialInfo.image} className={`browser-content_social_icon ${isValidUrl(socialInfo.url) || 'invalid-url' }`} style={{ backgroundImage: socialInfo.image }} />)
})
return socialIconList;
return socialDataset.map( (socialInfo) => {
return (
<div key={socialInfo.image}
onClick={(e) => setIsSocialFormOpen(!isSocialFormOpen)}
className={`browser-content_social_icon ${socialInfo.url ? isValidUrl(socialInfo.url) || '--invalid-url' : '--no-url' }`}
style={{ backgroundImage: socialInfo.image }} />
)
})
}

return (
Expand Down
13 changes: 11 additions & 2 deletions src/OnboardingSPA/components/MiniPreview/stylesheet.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,26 @@ $title-browser-color: #3858E9;
justify-content: flex-start;

&_icon{
opacity: 1;
width: 24px;
height: 24px;
filter: none;
cursor: pointer;
text-align: center;
padding-right: 6px;
background-position: center;
background-repeat: no-repeat;
background-clip: padding-box;
transition: opacity 0.4s ease-in-out;

&.invalid-url {
opacity: 0.8;
&.--no-url {
opacity: 0.5;
filter: grayscale(1);
}

&.--invalid-url {
opacity: 0.75;
filter: none;
}
}
}
Expand Down
14 changes: 6 additions & 8 deletions src/OnboardingSPA/components/SocialMediaForm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { useState, useEffect } from '@wordpress/element';

arunshenoy99 marked this conversation as resolved.
Show resolved Hide resolved
import Tooltip from './../Tooltip'

const SocialMediaForm = ({ socialData, setSocialData, setIsValidSocials }) => {
const [isActive, setIsActive] = useState(false);
const SocialMediaForm = ({ socialData, setSocialData, setIsValidSocials, isSocialFormOpen, setIsSocialFormOpen }) => {
const [facebook, setFacebook] = useState("");
const [twitter, setTwitter] = useState("");
const [instagram, setInstagram] = useState("");
Expand Down Expand Up @@ -105,11 +104,10 @@ const SocialMediaForm = ({ socialData, setSocialData, setIsValidSocials }) => {
}
}

setDataAndActiveErrorState( data, activeError);
setDataAndActiveErrorState(data, socialInput, activeError);
}

const setDataAndActiveErrorState = (data, activeError) => {

const setDataAndActiveErrorState = (data, socialInput, activeError) => {
if (!data){
var activeErrorFiltered = activeError.filter(function (item) {
return item !== socialInput
Expand All @@ -131,7 +129,7 @@ const SocialMediaForm = ({ socialData, setSocialData, setIsValidSocials }) => {
const checkValidUrlDebounce = _.debounce(checkValidUrl, 1000);

const handleAccordion = (e) => {
setIsActive(!isActive);
setIsSocialFormOpen(!isSocialFormOpen);
}

const handleChange = (e) => {
Expand Down Expand Up @@ -222,9 +220,9 @@ const SocialMediaForm = ({ socialData, setSocialData, setIsValidSocials }) => {
'wp-module-onboarding'
)}
</div>
<div className={`social-form__top-row_icon ${isActive ? 'social-form__top-row_icon_opened' : ''}`}></div>
<div className={`social-form__top-row_icon ${isSocialFormOpen ? 'social-form__top-row_icon_opened' : ''}`}></div>
</div>
<form className={isActive ? 'social-form__main-active' : 'social-form__main-hidden'} onSubmit={(e) => { handleSubmit(e) }}>
<form className={isSocialFormOpen ? 'social-form__main-active' : 'social-form__main-hidden'} onSubmit={(e) => { handleSubmit(e) }}>
{buildSocialBoxes()}
</form>
</div>
Expand Down
15 changes: 13 additions & 2 deletions src/OnboardingSPA/pages/Steps/BasicInfo/basicInfoForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { __, sprintf } from '@wordpress/i18n';
import { useDispatch, useSelect } from '@wordpress/data';
import { useState, useEffect } from '@wordpress/element';
import { store as coreStore } from '@wordpress/core-data';
import { useState, useEffect, useRef } from '@wordpress/element';

import content from './content.json';
import TextInput from '../../../components/TextInput';
Expand All @@ -19,6 +19,7 @@ import { translations } from '../../../utils/locales/translations';
* @return
*/
const BasicInfoForm = () => {
const socialMediaRef = useRef(null);
const [ isError, setIsError ] = useState( false );
const [ flowData, setFlowData ] = useState();
const [ isLoaded, setisLoaded ] = useState( false );
Expand All @@ -29,6 +30,7 @@ const BasicInfoForm = () => {
const [ siteLogo, setSiteLogo ] = useState( 0 );
const [ socialData, setSocialData ] = useState( '' );
const [ isValidSocials, setIsValidSocials ] = useState( false );
const [ isSocialFormOpen, setIsSocialFormOpen ] = useState( false );

const { setCurrentOnboardingData } = useDispatch( nfdOnboardingStore );
const { editEntityRecord } = useDispatch( coreStore );
Expand Down Expand Up @@ -64,6 +66,11 @@ const BasicInfoForm = () => {
return dataToSave;
}

useEffect(() => {
if(isSocialFormOpen)
socialMediaRef.current.scrollIntoView();
}, [isSocialFormOpen]);

useEffect( () => {
async function getFlowData() {
const socialDataAPI = await getSettings();
Expand Down Expand Up @@ -183,11 +190,13 @@ const BasicInfoForm = () => {
textValue={ siteDesc }
textValueSetter={ setSiteDesc }
/>
<div>
<div ref={socialMediaRef}>
<SocialMediaForm
socialData={ socialData }
setSocialData={ setSocialData }
isSocialFormOpen={ isSocialFormOpen }
setIsValidSocials={ setIsValidSocials }
setIsSocialFormOpen={ setIsSocialFormOpen }
/>
</div>
</div>
Expand All @@ -201,6 +210,8 @@ const BasicInfoForm = () => {
title={ siteTitle }
desc={ siteDesc }
socialData={ socialData }
isSocialFormOpen={ isSocialFormOpen }
setIsSocialFormOpen={ setIsSocialFormOpen }
/>
</div>
</div>
Expand Down