diff --git a/src/const.ts b/src/const.ts index e838e5b..0688e36 100644 --- a/src/const.ts +++ b/src/const.ts @@ -29,6 +29,7 @@ export const AvatarStyleCountExtra: AvatarConfigExtra = { export const CompatibleAgents = ['quark', 'micromessenger', 'weibo', 'douban']; export const PalettePreset = [ + 'transparent', '#fa541c', '#faad14', '#fadb14', @@ -58,16 +59,16 @@ export const ShapeStyleMapping: ShapeStyle = { }; export const SVGFilter = ` - - - - - - - - - -`; + + + + + + + + + + `; export const FestivalTimeMapping: FestivalTime = { halloween: { diff --git a/src/pages/components/AvatarEditor/index.tsx b/src/pages/components/AvatarEditor/index.tsx index f8f185d..7a86e35 100644 --- a/src/pages/components/AvatarEditor/index.tsx +++ b/src/pages/components/AvatarEditor/index.tsx @@ -82,8 +82,8 @@ export default function AvatarEditor() { return `\n\n - ${svgRaw.replace(/)>/, '').replace('', '')} - \n\n`; + ${svgRaw.replace(/)>/, '').replace('', '')} + \n\n`; }), ); @@ -95,17 +95,17 @@ export default function AvatarEditor() { groups.push(`\n\n - ${svgRaw.replace(/)>/, '').replace('', '')} - \n\n`); + ${svgRaw.replace(/)>/, '').replace('', '')} + \n\n`); } const previewSvg = ` - ${SVGFilter} - - ${groups.join('\n\n')} - - ` + ${SVGFilter} + + ${groups.join('\n\n')} + + ` .trim() .replace(/(\n|\t)/g, ''); @@ -135,6 +135,8 @@ export default function AvatarEditor() { scale: window.devicePixelRatio, width: dom.offsetWidth, height: dom.offsetHeight, + backgroundColor: + background.color === 'transparent' ? null : background.color, }); const userAgent = window.navigator.userAgent.toLowerCase(); const isNeedCompatible = CompatibleAgents.some( @@ -185,14 +187,14 @@ export default function AvatarEditor() { return ( <> {/* {modalStates.avatarPicker && ( - toggleModal('avatarPicker')} - avatarPart={avatarPart} - onConfirm={(newIdx) => - switchConfig({ index: newIdx, part: avatarPart.part }) - } - /> - )} */} + toggleModal('avatarPicker')} + avatarPart={avatarPart} + onConfirm={(newIdx) => + switchConfig({ index: newIdx, part: avatarPart.part }) + } + /> + )} */} {modalStates.download && ( { @@ -216,17 +218,17 @@ export default function AvatarEditor() { /> )} {/* {modalStates.palette && ( - { - toggleModal('palette'); - }} - onSelect={(background: AvatarBackgroundConfig) => { - setBackground({ ...background }); - toggleModal('palette'); - }} - backgroundConfig={background} - /> - )} */} + { + toggleModal('palette'); + }} + onSelect={(background: AvatarBackgroundConfig) => { + setBackground({ ...background }); + toggleModal('palette'); + }} + backgroundConfig={background} + /> + )} */}
{' '}