chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### 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
- [x] 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
- [x] 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: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { WidgetAddChild } from "actions/pageActions";
|
|
|
|
|
import { updateAndSaveLayout } from "actions/pageActions";
|
2023-04-26 07:18:16 +00:00
|
|
|
import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
|
2023-03-04 07:25:54 +00:00
|
|
|
import {
|
|
|
|
|
ReduxActionErrorTypes,
|
|
|
|
|
ReduxActionTypes,
|
2023-04-26 07:18:16 +00:00
|
|
|
} from "@appsmith/constants/ReduxActionConstants";
|
2023-10-02 19:41:05 +00:00
|
|
|
import type { FlexLayerAlignment } from "layoutSystems/common/utils/constants";
|
|
|
|
|
import { LayoutDirection } from "layoutSystems/common/utils/constants";
|
2023-03-04 07:25:54 +00:00
|
|
|
import {
|
|
|
|
|
GridDefaults,
|
|
|
|
|
MAIN_CONTAINER_WIDGET_ID,
|
|
|
|
|
} from "constants/WidgetConstants";
|
|
|
|
|
import log from "loglevel";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### 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
- [x] 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
- [x] 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: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
|
2023-03-04 07:25:54 +00:00
|
|
|
import { all, call, put, select, takeLatest } from "redux-saga/effects";
|
2023-05-11 04:45:14 +00:00
|
|
|
import { getWidgets, getWidgetsMeta } from "sagas/selectors";
|
2023-03-04 07:25:54 +00:00
|
|
|
import { getUpdateDslAfterCreatingChild } from "sagas/WidgetAdditionSagas";
|
|
|
|
|
import {
|
|
|
|
|
addNewLayer,
|
|
|
|
|
createFlexLayer,
|
|
|
|
|
removeWidgetsFromCurrentLayers,
|
|
|
|
|
updateExistingLayer,
|
|
|
|
|
updateRelationships,
|
2023-09-11 15:55:11 +00:00
|
|
|
} from "layoutSystems/autolayout/utils/autoLayoutDraggingUtils";
|
2023-10-02 19:41:05 +00:00
|
|
|
import type { HighlightInfo } from "layoutSystems/common/utils/types";
|
2023-09-11 15:55:11 +00:00
|
|
|
import { updatePositionsOfParentAndSiblings } from "layoutSystems/autolayout/utils/positionUtils";
|
2023-04-07 13:51:35 +00:00
|
|
|
import {
|
|
|
|
|
getCanvasWidth,
|
|
|
|
|
getIsAutoLayoutMobileBreakPoint,
|
|
|
|
|
} from "selectors/editorSelectors";
|
|
|
|
|
import { executeWidgetBlueprintBeforeOperations } from "sagas/WidgetBlueprintSagas";
|
2023-09-06 12:15:04 +00:00
|
|
|
import { BlueprintOperationTypes } from "WidgetProvider/constants";
|
2023-10-02 19:41:05 +00:00
|
|
|
import type { FlexLayer } from "layoutSystems/autolayout/utils/types";
|
2023-03-04 07:25:54 +00:00
|
|
|
|
|
|
|
|
function* addWidgetAndReorderSaga(
|
|
|
|
|
actionPayload: ReduxAction<{
|
|
|
|
|
newWidget: WidgetAddChild;
|
|
|
|
|
parentId: string;
|
|
|
|
|
direction: LayoutDirection;
|
|
|
|
|
dropPayload: HighlightInfo;
|
2023-04-07 13:51:35 +00:00
|
|
|
addToBottom: boolean;
|
2023-03-04 07:25:54 +00:00
|
|
|
}>,
|
|
|
|
|
) {
|
|
|
|
|
const start = performance.now();
|
2023-04-07 13:51:35 +00:00
|
|
|
const { addToBottom, direction, dropPayload, newWidget, parentId } =
|
|
|
|
|
actionPayload.payload;
|
2023-03-04 07:25:54 +00:00
|
|
|
const { alignment, index, isNewLayer, layerIndex, rowIndex } = dropPayload;
|
2023-04-07 13:51:35 +00:00
|
|
|
const isMobile: boolean = yield select(getIsAutoLayoutMobileBreakPoint);
|
|
|
|
|
const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
|
2023-03-04 07:25:54 +00:00
|
|
|
try {
|
2023-04-07 13:51:35 +00:00
|
|
|
const newParams: { [key: string]: any } = yield call(
|
|
|
|
|
executeWidgetBlueprintBeforeOperations,
|
|
|
|
|
BlueprintOperationTypes.UPDATE_CREATE_PARAMS_BEFORE_ADD,
|
|
|
|
|
{
|
|
|
|
|
parentId,
|
|
|
|
|
widgetId: newWidget.newWidgetId,
|
|
|
|
|
widgets: allWidgets,
|
|
|
|
|
widgetType: newWidget.type,
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
const updatedParams: WidgetAddChild = { ...newWidget, ...newParams };
|
2023-03-04 07:25:54 +00:00
|
|
|
const updatedWidgetsOnAddition: CanvasWidgetsReduxState = yield call(
|
|
|
|
|
getUpdateDslAfterCreatingChild,
|
|
|
|
|
{
|
2023-04-07 13:51:35 +00:00
|
|
|
...updatedParams,
|
2023-03-04 07:25:54 +00:00
|
|
|
widgetId: parentId,
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
2023-04-07 13:51:35 +00:00
|
|
|
if (!parentId || !updatedWidgetsOnAddition[parentId]) {
|
|
|
|
|
return updatedWidgetsOnAddition;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let widgetIndex = index;
|
|
|
|
|
let currLayerIndex = layerIndex;
|
2023-04-26 17:39:11 +00:00
|
|
|
let newLayer = isNewLayer;
|
2023-04-07 13:51:35 +00:00
|
|
|
|
|
|
|
|
const canvasWidget = updatedWidgetsOnAddition[parentId];
|
|
|
|
|
|
|
|
|
|
if (addToBottom && canvasWidget.children && canvasWidget.flexLayers) {
|
|
|
|
|
widgetIndex = canvasWidget.children.length;
|
|
|
|
|
currLayerIndex = canvasWidget.flexLayers.length;
|
2023-04-26 17:39:11 +00:00
|
|
|
newLayer = true;
|
2023-04-07 13:51:35 +00:00
|
|
|
}
|
|
|
|
|
|
2023-03-04 07:25:54 +00:00
|
|
|
const updatedWidgetsOnMove: CanvasWidgetsReduxState = yield call(
|
|
|
|
|
reorderAutolayoutChildren,
|
|
|
|
|
{
|
|
|
|
|
movedWidgets: [newWidget.newWidgetId],
|
2023-04-07 13:51:35 +00:00
|
|
|
index: widgetIndex,
|
2023-04-26 17:39:11 +00:00
|
|
|
isNewLayer: newLayer,
|
2023-03-04 07:25:54 +00:00
|
|
|
parentId,
|
|
|
|
|
allWidgets: updatedWidgetsOnAddition,
|
|
|
|
|
alignment,
|
|
|
|
|
direction,
|
2023-04-07 13:51:35 +00:00
|
|
|
layerIndex: currLayerIndex,
|
2023-03-04 07:25:54 +00:00
|
|
|
rowIndex,
|
|
|
|
|
isMobile,
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
yield put(updateAndSaveLayout(updatedWidgetsOnMove));
|
|
|
|
|
log.debug(
|
2023-06-09 08:52:27 +00:00
|
|
|
"Auto-layout : add new widget took",
|
2023-03-04 07:25:54 +00:00
|
|
|
performance.now() - start,
|
|
|
|
|
"ms",
|
|
|
|
|
);
|
|
|
|
|
} catch (error) {
|
|
|
|
|
yield put({
|
|
|
|
|
type: ReduxActionErrorTypes.WIDGET_OPERATION_ERROR,
|
|
|
|
|
payload: {
|
|
|
|
|
action: ReduxActionTypes.AUTOLAYOUT_ADD_NEW_WIDGETS,
|
|
|
|
|
error,
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function* autoLayoutReorderSaga(
|
|
|
|
|
actionPayload: ReduxAction<{
|
|
|
|
|
movedWidgets: string[];
|
|
|
|
|
parentId: string;
|
|
|
|
|
direction: LayoutDirection;
|
|
|
|
|
dropPayload: HighlightInfo;
|
|
|
|
|
}>,
|
|
|
|
|
) {
|
|
|
|
|
const start = performance.now();
|
|
|
|
|
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### 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
- [x] 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
- [x] 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: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
const { direction, dropPayload, movedWidgets, parentId } =
|
|
|
|
|
actionPayload.payload;
|
2023-03-04 07:25:54 +00:00
|
|
|
|
|
|
|
|
const { alignment, index, isNewLayer, layerIndex, rowIndex } = dropPayload;
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
|
2023-04-07 13:51:35 +00:00
|
|
|
const isMobile: boolean = yield select(getIsAutoLayoutMobileBreakPoint);
|
2023-03-04 07:25:54 +00:00
|
|
|
if (!parentId || !movedWidgets || !movedWidgets.length) return;
|
|
|
|
|
const updatedWidgets: CanvasWidgetsReduxState = yield call(
|
|
|
|
|
reorderAutolayoutChildren,
|
|
|
|
|
{
|
|
|
|
|
movedWidgets,
|
|
|
|
|
index,
|
|
|
|
|
isNewLayer,
|
|
|
|
|
parentId,
|
|
|
|
|
allWidgets,
|
|
|
|
|
alignment,
|
|
|
|
|
direction,
|
|
|
|
|
layerIndex,
|
|
|
|
|
rowIndex,
|
|
|
|
|
isMobile,
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
yield put(updateAndSaveLayout(updatedWidgets));
|
|
|
|
|
log.debug(
|
2023-06-09 08:52:27 +00:00
|
|
|
"Auto-layout : reorder computations took",
|
2023-03-04 07:25:54 +00:00
|
|
|
performance.now() - start,
|
|
|
|
|
"ms",
|
|
|
|
|
);
|
|
|
|
|
} catch (error) {
|
|
|
|
|
yield put({
|
|
|
|
|
type: ReduxActionErrorTypes.WIDGET_OPERATION_ERROR,
|
|
|
|
|
payload: {
|
|
|
|
|
action: ReduxActionTypes.AUTOLAYOUT_REORDER_WIDGETS,
|
|
|
|
|
error,
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function* reorderAutolayoutChildren(params: {
|
|
|
|
|
movedWidgets: string[];
|
|
|
|
|
index: number;
|
|
|
|
|
isNewLayer: boolean;
|
|
|
|
|
parentId: string;
|
|
|
|
|
allWidgets: CanvasWidgetsReduxState;
|
|
|
|
|
alignment: FlexLayerAlignment;
|
|
|
|
|
direction: LayoutDirection;
|
2023-04-07 13:51:35 +00:00
|
|
|
layerIndex: number;
|
2023-03-04 07:25:54 +00:00
|
|
|
rowIndex: number;
|
2023-04-07 13:51:35 +00:00
|
|
|
isMobile: boolean;
|
2023-03-04 07:25:54 +00:00
|
|
|
}) {
|
|
|
|
|
const {
|
|
|
|
|
alignment,
|
|
|
|
|
allWidgets,
|
|
|
|
|
direction,
|
|
|
|
|
index,
|
|
|
|
|
isMobile,
|
|
|
|
|
isNewLayer,
|
|
|
|
|
layerIndex,
|
|
|
|
|
movedWidgets,
|
|
|
|
|
parentId,
|
|
|
|
|
rowIndex,
|
|
|
|
|
} = params;
|
|
|
|
|
const widgets = Object.assign({}, allWidgets);
|
|
|
|
|
if (!movedWidgets) return widgets;
|
2023-04-07 13:51:35 +00:00
|
|
|
const mainCanvasWidth: number = yield select(getCanvasWidth);
|
2023-03-04 07:25:54 +00:00
|
|
|
const selectedWidgets = [...movedWidgets];
|
2023-05-11 04:45:14 +00:00
|
|
|
const metaProps: Record<string, any> = yield select(getWidgetsMeta);
|
2023-03-04 07:25:54 +00:00
|
|
|
|
|
|
|
|
let updatedWidgets: CanvasWidgetsReduxState = updateRelationships(
|
|
|
|
|
selectedWidgets,
|
|
|
|
|
widgets,
|
|
|
|
|
parentId,
|
|
|
|
|
false,
|
|
|
|
|
isMobile,
|
2023-04-07 13:51:35 +00:00
|
|
|
mainCanvasWidth,
|
2023-05-11 04:45:14 +00:00
|
|
|
metaProps,
|
2023-03-04 07:25:54 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Update flexLayers for a vertical stack.
|
|
|
|
|
if (direction === LayoutDirection.Vertical) {
|
|
|
|
|
const canvas = widgets[parentId];
|
|
|
|
|
if (!canvas) return widgets;
|
|
|
|
|
const flexLayers = canvas.flexLayers || [];
|
|
|
|
|
|
|
|
|
|
// Remove moved widgets from the flex layers.
|
|
|
|
|
const filteredLayers = removeWidgetsFromCurrentLayers(
|
|
|
|
|
selectedWidgets,
|
|
|
|
|
flexLayers,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Create a temporary layer from moved widgets.
|
|
|
|
|
const newLayer: FlexLayer = createFlexLayer(
|
|
|
|
|
selectedWidgets,
|
|
|
|
|
widgets,
|
|
|
|
|
alignment,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Add the new layer to the flex layers.
|
|
|
|
|
updatedWidgets = isNewLayer
|
|
|
|
|
? addNewLayer(
|
|
|
|
|
newLayer,
|
|
|
|
|
updatedWidgets,
|
|
|
|
|
parentId,
|
|
|
|
|
filteredLayers,
|
|
|
|
|
layerIndex,
|
|
|
|
|
)
|
|
|
|
|
: updateExistingLayer(
|
|
|
|
|
newLayer,
|
|
|
|
|
updatedWidgets,
|
|
|
|
|
parentId,
|
|
|
|
|
filteredLayers,
|
|
|
|
|
layerIndex,
|
|
|
|
|
rowIndex,
|
|
|
|
|
);
|
2023-04-07 13:51:35 +00:00
|
|
|
updatedWidgets = movedWidgets.reduce((widgets, eachWidget) => {
|
|
|
|
|
const widget = widgets[eachWidget];
|
|
|
|
|
widgets[eachWidget] = {
|
|
|
|
|
...widget,
|
|
|
|
|
alignment,
|
|
|
|
|
};
|
|
|
|
|
return widgets;
|
|
|
|
|
}, updatedWidgets);
|
2023-03-04 07:25:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// update children of the parent canvas.
|
|
|
|
|
const items = [...(widgets[parentId].children || [])];
|
|
|
|
|
// remove moved widgets from children
|
|
|
|
|
const newItems = items.filter((item) => movedWidgets.indexOf(item) === -1);
|
|
|
|
|
// calculate valid position for drop
|
|
|
|
|
const pos = index > newItems.length ? newItems.length : index;
|
|
|
|
|
updatedWidgets[parentId] = {
|
|
|
|
|
...updatedWidgets[parentId],
|
|
|
|
|
children: [
|
|
|
|
|
...newItems.slice(0, pos),
|
|
|
|
|
...movedWidgets,
|
|
|
|
|
...newItems.slice(pos),
|
|
|
|
|
],
|
|
|
|
|
};
|
|
|
|
|
const parentWidget =
|
|
|
|
|
allWidgets[allWidgets[parentId].parentId || MAIN_CONTAINER_WIDGET_ID];
|
2023-05-11 04:45:14 +00:00
|
|
|
const isAutoLayoutContainerCanvas =
|
|
|
|
|
parentWidget.type === "CONTAINER_WIDGET" &&
|
|
|
|
|
!parentWidget.isListItemContainer;
|
2023-03-04 07:25:54 +00:00
|
|
|
if (isAutoLayoutContainerCanvas) {
|
|
|
|
|
const height =
|
|
|
|
|
allWidgets[parentId].bottomRow / GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
|
|
|
updatedWidgets[parentWidget.widgetId] = {
|
|
|
|
|
...updatedWidgets[parentWidget.widgetId],
|
|
|
|
|
bottomRow: parentWidget.topRow + height,
|
|
|
|
|
};
|
|
|
|
|
}
|
2023-04-07 13:51:35 +00:00
|
|
|
const widgetsAfterPositionUpdate = updatePositionsOfParentAndSiblings(
|
2023-03-04 07:25:54 +00:00
|
|
|
updatedWidgets,
|
|
|
|
|
parentId,
|
2023-04-07 13:51:35 +00:00
|
|
|
layerIndex,
|
2023-03-04 07:25:54 +00:00
|
|
|
isMobile,
|
2023-04-07 13:51:35 +00:00
|
|
|
mainCanvasWidth,
|
2023-05-11 04:45:14 +00:00
|
|
|
false,
|
|
|
|
|
metaProps,
|
2023-03-04 07:25:54 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
|
|
return widgetsAfterPositionUpdate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export default function* autoLayoutDraggingSagas() {
|
|
|
|
|
yield all([
|
|
|
|
|
takeLatest(
|
|
|
|
|
ReduxActionTypes.AUTOLAYOUT_REORDER_WIDGETS,
|
|
|
|
|
autoLayoutReorderSaga,
|
|
|
|
|
),
|
|
|
|
|
takeLatest(
|
|
|
|
|
ReduxActionTypes.AUTOLAYOUT_ADD_NEW_WIDGETS,
|
|
|
|
|
addWidgetAndReorderSaga,
|
|
|
|
|
),
|
|
|
|
|
]);
|
|
|
|
|
}
|