Skip to content
Snippets Groups Projects
Unverified Commit 23d7d862 authored by Anton Kulyk's avatar Anton Kulyk Committed by GitHub
Browse files

Fix long form scroll behavior in the action editor (#28455)

parent 6b35f293
No related branches found
No related tags found
No related merge requests found
...@@ -44,3 +44,9 @@ export const ModalLeft = styled.div` ...@@ -44,3 +44,9 @@ export const ModalLeft = styled.div`
flex-direction: column; flex-direction: column;
border-right: 1px solid ${color("border")}; border-right: 1px solid ${color("border")};
`; `;
export const ModalRight = styled.div`
position: relative;
display: flex;
overflow-y: auto;
`;
...@@ -14,6 +14,7 @@ import { ...@@ -14,6 +14,7 @@ import {
ModalRoot, ModalRoot,
ModalActions, ModalActions,
ModalLeft, ModalLeft,
ModalRight,
} from "metabase/actions/containers/ActionCreator/ActionCreator.styled"; } from "metabase/actions/containers/ActionCreator/ActionCreator.styled";
import { isNotNull } from "metabase/core/utils/types"; import { isNotNull } from "metabase/core/utils/types";
...@@ -116,24 +117,26 @@ export default function ActionCreatorView({ ...@@ -116,24 +117,26 @@ export default function ActionCreatorView({
)} )}
</ModalActions> </ModalActions>
</ModalLeft> </ModalLeft>
{activeSideView === "actionForm" ? ( <ModalRight>
<FormCreator {activeSideView === "actionForm" ? (
params={action.parameters ?? []} <FormCreator
formSettings={formSettings} params={action.parameters ?? []}
isEditable={isEditable && canChangeFieldSettings} formSettings={formSettings}
onChange={onChangeFormSettings} isEditable={isEditable && canChangeFieldSettings}
/> onChange={onChangeFormSettings}
) : activeSideView === "dataReference" ? ( />
<DataReferenceInline onClose={closeSideView} /> ) : activeSideView === "dataReference" ? (
) : activeSideView === "actionSettings" ? ( <DataReferenceInline onClose={closeSideView} />
<InlineActionSettings ) : activeSideView === "actionSettings" ? (
action={action} <InlineActionSettings
formSettings={formSettings} action={action}
isEditable={isEditable} formSettings={formSettings}
onChangeFormSettings={onChangeFormSettings} isEditable={isEditable}
onClose={closeSideView} onChangeFormSettings={onChangeFormSettings}
/> onClose={closeSideView}
) : null} />
) : null}
</ModalRight>
</ActionCreatorBodyContainer> </ActionCreatorBodyContainer>
</ModalRoot> </ModalRoot>
); );
......
...@@ -4,6 +4,8 @@ import { color } from "metabase/lib/colors"; ...@@ -4,6 +4,8 @@ import { color } from "metabase/lib/colors";
import SidebarContent from "metabase/query_builder/components/SidebarContent"; import SidebarContent from "metabase/query_builder/components/SidebarContent";
export const ActionSettingsContainer = styled.div` export const ActionSettingsContainer = styled.div`
width: 100%;
${SidebarContent.Header.Root} { ${SidebarContent.Header.Root} {
position: sticky; position: sticky;
top: 0; top: 0;
......
...@@ -6,6 +6,7 @@ import SidebarContent from "metabase/query_builder/components/SidebarContent"; ...@@ -6,6 +6,7 @@ import SidebarContent from "metabase/query_builder/components/SidebarContent";
export const DataReferenceContainer = styled.div` export const DataReferenceContainer = styled.div`
overflow: hidden; overflow: hidden;
position: relative; position: relative;
width: 100%;
height: 100%; height: 100%;
background-color: ${color("white")}; background-color: ${color("white")};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment