Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/appsmithorg/appsmith into feat/reactive-actions-run-behaviour

Browse Source
This commit is contained in:
Ankita Kinger 2025-05-08 17:12:58 +05:30
commit d0a1e83ff2
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts
View File

@ -97,7 +97,7 @@ export const containerDimensionStyles = <T = FlexCssProps[keyof FlexCssProps]>(
if (current !== "base") {
return (
prev +
`@container (min-width: ${current}) {& {
`@container flex-container (min-width: ${current}) {& {
${cssProp}: ${
//@ts-expect-error: type mismatch
callback ? callback(value[current], extraProps) : value[current]

1
app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css
View File

@ -1,5 +1,6 @@
.flexContainer {
container-type: inline-size;
container-name: flex-container;
display: flex;
justify-content: center;
width: 100%;

1
app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css
View File

@ -1,3 +1,4 @@
.make-container {
container-type: inline-size;
container-name: flex-container;
}

2
app/client/src/sagas/TemplatesSagas.ts
View File

@ -49,7 +49,6 @@ import { getAllPageIdentities } from "./selectors";
import {
openCarbonModal,
setCreateAgentModalOpen,
toggleFCIntegrations,
} from "ee/actions/aiAgentActions";
import { getIsAiAgentFlowEnabled } from "ee/selectors/aiAgentSelectors";
import { getTemplatesByFlagSelector } from "selectors/templatesSelectors";
@ -116,7 +115,6 @@ function* importTemplateToWorkspaceSaga(
if (isScratchTemplate) {
yield put(openCarbonModal({ shouldOpen: true }));
yield put(toggleFCIntegrations({ isEnabled: true }));
}
yield put(setCreateAgentModalOpen({ isOpen: false }));

12
app/client/src/widgets/TableWidgetV2/widget/index.tsx
View File

@ -1045,14 +1045,14 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
// Reset widget state when infinite scroll is initially enabled
// This should come after all updateInfiniteScrollProperties are done
if (!prevProps.infiniteScrollEnabled && infiniteScrollEnabled) {
this.resetTableForInfiniteScroll();
}
const didInfiniteScrollEnabledChange =
prevProps.infiniteScrollEnabled !== infiniteScrollEnabled;
const didComponentHeightChange =
prevProps.componentHeight !== componentHeight;
// Reset widget state when height changes while infinite scroll is enabled
if (
infiniteScrollEnabled &&
prevProps.componentHeight !== componentHeight
didInfiniteScrollEnabledChange ||
(infiniteScrollEnabled && didComponentHeightChange)
) {
this.resetTableForInfiniteScroll();
}