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.

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

chore(web): fix title padding changes updating page padding #840

Merged
merged 4 commits into from
Nov 29, 2023
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
4 changes: 3 additions & 1 deletion web/src/beta/lib/core/StoryPanel/ActionPanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type Props = {
dndEnabled?: boolean;
position?: ActionPosition;
isHovered?: boolean;
overrideGroupId?: string;
setShowPadding: Dispatch<SetStateAction<boolean>>;
onSettingsToggle?: () => void;
onRemove?: () => void;
Expand Down Expand Up @@ -65,6 +66,7 @@ const ActionPanel: React.FC<Props> = ({
actionItems,
position,
dndEnabled,
overrideGroupId,
setShowPadding,
onSettingsToggle,
onRemove,
Expand Down Expand Up @@ -144,7 +146,7 @@ const ActionPanel: React.FC<Props> = ({
<SettingsContent>
{Object.keys(panelSettings).map((fieldId, index) => {
const field = panelSettings[fieldId];
const groupId = "panel";
const groupId = overrideGroupId || "panel";
return (
<FieldComponent
key={index}
Expand Down
14 changes: 3 additions & 11 deletions web/src/beta/lib/core/StoryPanel/Block/builtin/Title/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,7 @@ export type Props = BlockProps;
const TitleBlock: React.FC<Props> = ({ block, isSelected, ...props }) => {
const t = useT();

const property = useMemo(
() => ({
title: {
title: block?.property?.title?.title,
color: block?.property?.title?.color,
},
panel: { padding: block?.property?.title?.padding },
}),
[block?.property],
);
const property = useMemo(() => block?.property, [block?.property]);

const title = useMemo(
() => property?.title?.title?.value as ValueTypes["string"],
Expand All @@ -34,7 +25,8 @@ const TitleBlock: React.FC<Props> = ({ block, isSelected, ...props }) => {
() => property?.title?.color?.value as ValueTypes["string"],
[property?.title?.color?.value],
);
const hasEmptySpace = isEmptyString(title);

const hasEmptySpace = useMemo(() => isEmptyString(title), [title]);

return (
<BlockWrapper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type Props = {
panelSettings?: any;
dndEnabled?: boolean;
position?: ActionPosition;
overrideGroupId?: string;
setShowPadding: Dispatch<SetStateAction<boolean>>;
onEditModeToggle?: () => void;
onSettingsToggle?: () => void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ const BlockWrapper: React.FC<Props> = ({
panelSettings={panelSettings}
editMode={editMode}
isEditable={isEditable}
overrideGroupId={groupId === "title" ? groupId : undefined}
setEditMode={setEditMode}
onEditModeToggle={handleEditModeToggle}
onSettingsToggle={handleSettingsToggle}
Expand All @@ -123,11 +124,11 @@ const BlockWrapper: React.FC<Props> = ({
</Block>
{editMode && groupId && propertyId && settingsEnabled && (
<EditorPanel onClick={stopClickPropagation}>
{Object.keys(defaultSettings).map(fieldId => {
{Object.keys(defaultSettings).map((fieldId, idx) => {
const field = defaultSettings[fieldId];
return (
<FieldComponent
key={groupId + propertyId}
key={groupId + propertyId + idx}
propertyId={propertyId}
groupId={groupId}
fieldId={fieldId}
Expand Down
13 changes: 11 additions & 2 deletions web/src/beta/lib/core/StoryPanel/Page/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,16 @@ export default ({
[property?.panel, isEditable],
);

const title = useMemo(() => property?.title, [property?.title]);
const titleProperty = useMemo(
() => ({
title: {
title: property?.title?.title,
color: property?.title?.color,
},
panel: { padding: property?.title?.padding },
}),
[property?.title],
);

const titleId = useMemo(() => `${page?.id}/title`, [page?.id]);

Expand All @@ -76,7 +85,7 @@ export default ({
return {
openBlocksIndex,
titleId,
title,
titleProperty,
propertyId,
property,
panelSettings,
Expand Down
8 changes: 4 additions & 4 deletions web/src/beta/lib/core/StoryPanel/Page/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const StoryPanel: React.FC<Props> = ({
const {
openBlocksIndex,
titleId,
title,
titleProperty,
propertyId,
panelSettings,
storyBlocks,
Expand Down Expand Up @@ -145,7 +145,7 @@ const StoryPanel: React.FC<Props> = ({
padding={panelSettings?.padding?.value}
gap={panelSettings?.gap?.value}>
<PageTitleWrapper>
{(isEditable || title?.title?.value) && (
{(isEditable || titleProperty?.title?.title?.value) && (
// The title block is a pseudo block.
// It is not saved in the story block list and not draggable because
// it is actually a field on the story page.
Expand All @@ -155,8 +155,8 @@ const StoryPanel: React.FC<Props> = ({
pluginId: "reearth",
extensionId: "titleStoryBlock",
name: t("Title"),
propertyId: page?.propertyId ?? "",
property: { title },
propertyId,
property: titleProperty,
}}
isEditable={isEditable}
isSelected={selectedStoryBlockId === titleId}
Expand Down
3 changes: 3 additions & 0 deletions web/src/beta/lib/core/StoryPanel/SelectableArea/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type Props = {
position?: ActionPosition;
noBorder?: boolean;
isEditable?: boolean;
overrideGroupId?: string;
setEditMode?: Dispatch<SetStateAction<boolean>>;
onEditModeToggle?: () => void;
onSettingsToggle?: () => void;
Expand Down Expand Up @@ -60,6 +61,7 @@ const SelectableArea: React.FC<Props> = ({
noBorder,
isEditable,
panelSettings,
overrideGroupId,
setEditMode,
onEditModeToggle,
onSettingsToggle,
Expand Down Expand Up @@ -91,6 +93,7 @@ const SelectableArea: React.FC<Props> = ({
panelSettings={panelSettings}
dndEnabled={dndEnabled}
position={position}
overrideGroupId={overrideGroupId}
setShowPadding={setShowPadding}
onEditModeToggle={onEditModeToggle}
onSettingsToggle={onSettingsToggle}
Expand Down
Loading