## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
109 lines
2.3 KiB
TypeScript
109 lines
2.3 KiB
TypeScript
import React, { useCallback } from "react";
|
|
import styled from "styled-components";
|
|
import { useDispatch, useSelector } from "react-redux";
|
|
|
|
import { updateApplicationLayout } from "@appsmith/actions/applicationActions";
|
|
import type {
|
|
AppLayoutConfig,
|
|
SupportedLayouts,
|
|
} from "reducers/entityReducers/pageListReducer";
|
|
import {
|
|
getCurrentApplicationId,
|
|
getCurrentApplicationLayout,
|
|
} from "selectors/editorSelectors";
|
|
import { Icon, SegmentedControl, Tooltip } from "design-system";
|
|
|
|
const StyledSegmentedControl = styled(SegmentedControl)`
|
|
> .ads-v2-segmented-control__segments-container {
|
|
flex: 1 1 0%;
|
|
}
|
|
`;
|
|
|
|
interface AppsmithLayoutConfigOption {
|
|
name: string;
|
|
type: SupportedLayouts;
|
|
icon: string;
|
|
}
|
|
|
|
export const AppsmithDefaultLayout: AppLayoutConfig = {
|
|
type: "FLUID",
|
|
};
|
|
|
|
const AppsmithLayouts: AppsmithLayoutConfigOption[] = [
|
|
{
|
|
name: "Fluid width",
|
|
type: "FLUID",
|
|
icon: "fluid",
|
|
},
|
|
{
|
|
name: "Desktop",
|
|
type: "DESKTOP",
|
|
icon: "desktop",
|
|
},
|
|
{
|
|
name: "Tablet (Landscape)",
|
|
type: "TABLET_LARGE",
|
|
icon: "tabletLandscape",
|
|
},
|
|
{
|
|
name: "Tablet (Portrait)",
|
|
type: "TABLET",
|
|
icon: "tablet",
|
|
},
|
|
{
|
|
name: "Mobile device",
|
|
type: "MOBILE",
|
|
icon: "mobile",
|
|
},
|
|
];
|
|
|
|
const options = AppsmithLayouts.map((layout, index) => ({
|
|
label: (
|
|
<Tooltip
|
|
content={layout.name}
|
|
key={layout.name}
|
|
mouseEnterDelay={0}
|
|
placement={
|
|
index === AppsmithLayouts.length - 1 ? "bottomRight" : "bottom"
|
|
}
|
|
>
|
|
<Icon name={layout.icon} size="md" />
|
|
</Tooltip>
|
|
),
|
|
value: layout.type,
|
|
}));
|
|
|
|
export function MainContainerLayoutControl() {
|
|
const dispatch = useDispatch();
|
|
const appId = useSelector(getCurrentApplicationId);
|
|
const appLayout = useSelector(getCurrentApplicationLayout);
|
|
/**
|
|
* updates the app layout
|
|
*
|
|
* @param layoutConfig
|
|
*/
|
|
const updateAppLayout = useCallback(
|
|
(type: string) => {
|
|
dispatch(
|
|
updateApplicationLayout(appId || "", {
|
|
appLayout: {
|
|
// @ts-expect-error: Type error
|
|
type,
|
|
},
|
|
}),
|
|
);
|
|
},
|
|
[dispatch, appLayout],
|
|
);
|
|
|
|
return (
|
|
<div className="pb-6 space-y-2 t--layout-control-wrapper">
|
|
<StyledSegmentedControl
|
|
defaultValue={appLayout.type}
|
|
onChange={updateAppLayout}
|
|
options={options}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|