Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { useMemo, useRef, useState } from "react";
import { DxcContainer, DxcFlex, DxcWizard } from "@dxc-technology/halstack-react";
import StepHeading from "./components/StepHeading";
import BottomButtons from "./components/BottomButtons";
import ThemeGeneratorPreviewPage from "./ThemeGeneratorPreviewPage";
import { BrandingDetails } from "./steps/BrandingDetails";
import BrandingDetails from "./steps/BrandingDetails";
import { generateTokens, handleExport } from "./utils";
import { Colors, FileData, Step } from "./types";
import ReviewDetails from "./steps/ReviewDetails";
import Tour from "./components/Tour/Tour";
import PreviewScreen from "./steps/PreviewScreen";

const steps = [
{
Expand Down Expand Up @@ -104,7 +104,7 @@ const ThemeGeneratorConfigPage = () => {
case 0:
return <BrandingDetails colors={colors} onColorsChange={setColors} logos={logos} onLogosChange={setLogos} />;
case 1:
return <ThemeGeneratorPreviewPage tokens={tokens} logos={logos} showDefaultComponents={tourStepIndex === 2} />;
return <PreviewScreen tokens={tokens} logos={logos} showDefaultComponents={tourStepIndex === 2} />;
case 2:
return <ReviewDetails tokens={tokens} logos={logos} themeJson={themeJson} />;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const brandingDetails = {
],
};

export const BrandingDetails = ({
const BrandingDetails = ({
colors,
onColorsChange,
logos,
Expand Down Expand Up @@ -92,3 +92,5 @@ export const BrandingDetails = ({
</DxcContainer>
);
};

export default BrandingDetails;
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import {
HalstackProvider,
} from "@dxc-technology/halstack-react";
import { ReactNode, SVGProps, useMemo, useState, useEffect } from "react";
import componentsList from "../common/componentsList.json";
import componentsList from "../../common/componentsList.json";
import { componentsRegistry, examplesRegistry } from "screens/theme-generator/componentsRegistry";
import styled from "@emotion/styled";
import { ComponentItem, Logos } from "./types";
import { ComponentItem, Logos } from "../types";

// TODO: Both of these types should be exported by @dxc-technology/halstack-react when they are available
type SVG = ReactNode & SVGProps<SVGSVGElement>;
Expand Down Expand Up @@ -109,7 +109,7 @@ const mapToSelectGroups = (data: ComponentItem[]) => {
}));
};

const ThemeGeneratorPreviewPage = ({
const PreviewScreen = ({
tokens,
logos,
showDefaultComponents,
Expand All @@ -124,7 +124,7 @@ const ThemeGeneratorPreviewPage = ({
const [selectedExample, setSelectedExample] = useState<string>("");

const componentOptions = useMemo(() => {
return mapToSelectGroups(componentsList as ComponentItem[]);
return mapToSelectGroups(componentsList);
}, []);

// Set default components when requested and clear on cleanup
Expand Down Expand Up @@ -297,4 +297,4 @@ const PreviewAreaContainer = styled.div`
overflow: auto;
`;

export default ThemeGeneratorPreviewPage;
export default PreviewScreen;
Loading