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

Fix default palette issue in SiteGen Customize Sidebar #476

Merged
merged 6 commits into from
Feb 21, 2024
Merged

Fix default palette issue in SiteGen Customize Sidebar #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bffdc64
Fix issues with default palette and reset
mr-vara Feb 20, 2024
2de367e
Fix issues with default palette and reset
mr-vara Feb 20, 2024
996ab51
Update horizontal scrolling to next line
mr-vara Feb 21, 2024
bacf099
Update palette colors to use theme colors
mr-vara Feb 21, 2024
2e687ba
Merge branch 'trunk' of github.com:newfold-labs/wp-module-onboarding …
mr-vara Feb 21, 2024
f43376c
Merge branch 'trunk' into fix-default-palette
officiallygod Feb 21, 2024
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
139 changes: 78 additions & 61 deletions src/OnboardingSPA/components/Sidebar/components/Customize/DesignColorsPanel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { __ } from '@wordpress/i18n';
// eslint-disable-next-line import/no-extraneous-dependencies
import { cloneDeep } from 'lodash';

let defaultGlobalData = null;
const DesignColorsPanel = forwardRef(
(
{
Expand All @@ -22,80 +21,98 @@ const DesignColorsPanel = forwardRef(
ref
) => {
const resetToDefaultColors = () => {
const slug = currentData.sitegen?.homepages?.active?.slug;
if ( ! slug ) {
return;
}
const defaultDataToReset = defaultGlobalData[ slug ];
if ( ! defaultDataToReset ) {
return;
}
const updatedData = {
...currentData,
sitegen: {
...currentData.sitegen,
homepages: {
...currentData.sitegen.homepages,
active: {
...currentData.sitegen.homepages.active,
color: {
...currentData.sitegen.homepages.active.color,
selectedPalette: null,
palette: [
...defaultDataToReset.color.palette,
],
},
},
},
},
};

setSelectedColor( {} );
setSelectedPalette( null );
setSelectedPalette( 0 );
setSelectedColor( colors[ 0 ] );
setShowCustomColors( false );
setCurrentOnboardingData( updatedData );
};

useImperativeHandle( ref, () => ( {
resetToDefaultColors,
} ) );

const { currentData, customizeSidebarData } = useSelect( ( select ) => {
return {
currentData:
select( nfdOnboardingStore ).getCurrentOnboardingData(),
customizeSidebarData:
select( nfdOnboardingStore ).getCustomizeSidebarData(),
};
} );
const { currentData, customizeSidebarData, themeColors } = useSelect(
( select ) => {
return {
currentData:
select( nfdOnboardingStore ).getCurrentOnboardingData(),
customizeSidebarData:
select( nfdOnboardingStore ).getCustomizeSidebarData(),
themeColors:
select( nfdOnboardingStore ).getPreviewSettings()
.settings.colors,
};
}
);

useEffect( () => {
if ( ! defaultGlobalData ) {
defaultGlobalData = cloneDeep(
currentData.sitegen.homepages.data
);
const slug = currentData.sitegen?.homepages?.active?.slug;

let defaultPalette =
currentData.sitegen.homepages.active.color.defaultPalette;
if ( defaultPalette ) {
return;
}
defaultPalette = cloneDeep(
currentData.sitegen.homepages.active.color.palette
);
currentData.sitegen.homepages.data[ slug ].color.defaultPalette =
defaultPalette;
currentData.sitegen.homepages.active.color.defaultPalette =
defaultPalette;
setCurrentOnboardingData( currentData );

// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ currentData ] );

const colorPalettes = customizeSidebarData?.colorPalettes;
let palettePrimaryColors = themeColors?.map( ( colorObj ) => ( {
name: colorObj.name,
color: colorObj.color,
} ) );

const palettePrimaryColors = Object.entries( colorPalettes[ 0 ] ).map(
( [ , color ] ) => ( {
name: __( 'Custom', 'wp-module-onboarding' ),
color,
} )
);

const palettes = [];

colorPalettes.forEach( ( palette ) => {
palettes.push( {
primary: palette?.primary,
secondary: palette?.secondary || palette?.base,
tertiary: palette?.tertiary || palette?.primary,
if ( ! palettePrimaryColors ) {
palettePrimaryColors = Object.entries( colorPalettes[ 0 ] ).map(
( [ , color ] ) => ( {
name: __( 'Custom', 'wp-module-onboarding' ),
color,
} )
);
}

const definePalettes = () => {
const palettes = [];
const defaultPalette =
currentData?.sitegen?.homepages?.active?.color
?.defaultPalette ||
currentData?.sitegen?.homepages?.active?.color?.palette;

colorPalettes.forEach( ( palette ) => {
let isDefault = true;
[ 'primary', 'base', 'tertiary' ].forEach( ( key ) => {
const colorInPalette = palette[ key ];
const colorInDefault = defaultPalette.find(
( color ) => color.slug === key
)?.color;
if ( colorInPalette !== colorInDefault ) {
isDefault = false;
}
} );
const paletteObj = {
primary: palette?.primary,
secondary: palette?.secondary || palette?.base,
tertiary: palette?.tertiary || palette?.primary,
isDefault,
};
if ( isDefault ) {
palettes.unshift( paletteObj );
} else {
palettes.push( paletteObj );
}
} );
} );

return palettes;
};
const palettes = definePalettes();

const [ colors ] = useState( palettes );
const [ customColors, setCustomColors ] = useState( null );
Expand All @@ -117,8 +134,8 @@ const DesignColorsPanel = forwardRef(
setCustomColors( customColorsToSet || palettes[ 0 ] );
}

if ( ! selectedPalette ) {
const selectedPaletteToSet = activeColor.selectedPalette;
if ( ! selectedPalette && selectedPalette !== 0 ) {
const selectedPaletteToSet = activeColor.selectedPalette || 0;
setSelectedPalette( selectedPaletteToSet );
if ( selectedPaletteToSet === 'custom' ) {
setShowCustomColors( true );
Expand Down
2 changes: 1 addition & 1 deletion src/OnboardingSPA/components/Sidebar/components/Customize/DesignColorsPanel/stylesheet.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
display: flex;
gap: 20px;
padding: 10px 4px;
overflow-x: auto;
flex-wrap: wrap;
max-width: 250px;
}

Expand Down
Loading