Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
32c42b2
feat: introduce SDK capability dndMigration [SPA-2745] (#1134)
Chaoste May 23, 2025
fe0dbc2
chore: allow v3-prerelease branch for lerna publishing
Chaoste May 28, 2025
4d5362d
feat!: remove dnd [SPA-2803] (#1138)
Chaoste May 28, 2025
6e3f8d3
feat(visual-editor): Send CanvasGeometryUpdated Event [SPA-2804] (#1144)
Chaoste Jun 3, 2025
a38c452
feat: use offsetHeight for canvasGeometry [] (#1149)
maxcheremisin Jun 3, 2025
9e3b8ab
feat: listen to the entire html for canvas geometry, as there might b…
maxcheremisin Jun 4, 2025
825736c
feat: [] skip hidden nodes (#1193)
maxcheremisin Jun 26, 2025
dbf6a7f
fix: remove old PreviewUnboundImage and unnnecessary special casing (…
Chaoste Jul 2, 2025
5b1cf53
fix: remove falsly kept file from merge conflict
Chaoste Jul 4, 2025
55c2323
fix: render empty carousel and containers with min width and height
Chaoste Jul 4, 2025
edde90c
fix: correctly render editor attribets on CustomImage
Chaoste Jul 4, 2025
19b59bd
test: check created CSS code for merged pattern default
Chaoste Jul 4, 2025
591c663
fix: adjust test due to removed border-box rule on every node
Chaoste Jul 4, 2025
3b1877f
chore: remove v3 downstream CI updates as it didnt work anyways
Chaoste Jul 4, 2025
21532c2
chore: [] send initial canvas geometry (#1219)
maxcheremisin Jul 11, 2025
fe8fd0b
fix: render cfVisibility in editor mode for CSR apps
Chaoste Jul 31, 2025
6413b63
fix: mocks in tests
Chaoste Aug 4, 2025
4672a6a
fix: increase handshake timeout
Chaoste Aug 5, 2025
42cce69
Merge pull request #1244 from contentful/fix/SPA-3058-increase-handshake
Chaoste Aug 5, 2025
bdd2701
chore: remove special casing from lerna and CI config for v3 branch
Chaoste Aug 5, 2025
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
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
(github.ref_name == 'main' ||
github.ref_name == 'development' ||
github.ref_name == 'next' ||
github.ref_name == 'v3-prerelease' ||
inputs.publish-prerelease
) &&
!contains(github.event.head_commit.message, 'skip-release') &&
Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ jobs:
npx lerna publish --conventional-commits --conventional-prerelease --exact --force-publish --preid prerelease-$(date +%Y%m%dT%H%M)-$(git rev-parse HEAD | cut -c1-7) --no-changelog --no-push --yes --no-private --dist-tag prerelease --allow-branch ${{ github.ref_name }} --git-tag-command="echo 'skipping git tag for prereleases'"
elif [ ${{ github.ref_name }} = development ]; then
npx lerna publish --conventional-commits --conventional-prerelease --exact --force-publish --preid dev-$(date +%Y%m%dT%H%M)-$(git rev-parse HEAD | cut -c1-7) --dist-tag dev --no-changelog --no-push --yes --no-private --git-tag-command="echo 'skipping git tag for prereleases'"
elif [ ${{ github.ref_name }} = v3-prerelease ]; then
npx lerna publish --conventional-commits --conventional-prerelease --exact --force-publish --preid alpha-$(date +%Y%m%dT%H%M)-$(git rev-parse HEAD | cut -c1-7) --dist-tag alpha --no-changelog --no-push --yes --no-private --git-tag-command="echo 'skipping git tag for prereleases'"
elif [ ${{ github.ref_name }} = next ]; then
npx lerna publish --conventional-commits --conventional-prerelease --exact --force-publish --preid beta --dist-tag next --no-changelog --yes --no-private --git-tag-command="echo 'skipping git tag for prereleases'"
else
Expand All @@ -107,34 +105,9 @@ jobs:
git pull
git rebase next
git push origin
git checkout v3-prerelease
git pull
{ # try
git rebase development &&
git push origin
} || { # catch
echo "⚠️ Silently failed to update v3-prerelease"
}
elif [ ${{ github.ref_name }} = next ]; then
git checkout development
git pull
git rebase next
git push origin
git checkout v3-prerelease
git pull
{ # try
git rebase development &&
git push origin
} || { # catch
echo "⚠️ Silently failed to update v3-prerelease"
}
elif [ ${{ github.ref_name }} = development ]; then
git checkout v3-prerelease
git pull
{ # try
git rebase development &&
git push origin
} || { # catch
echo "⚠️ Silently failed to update v3-prerelease"
}
fi
123 changes: 0 additions & 123 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 3 additions & 37 deletions packages/components/src/components/Assembly/Assembly.tsx
Original file line number Diff line number Diff line change
@@ -1,45 +1,11 @@
import {
ExperienceTreeNode,
ResolveDesignValueType,
StyleProps,
} from '@contentful/experiences-core/types';
import React from 'react';
import { StructureComponentProps } from '@contentful/experiences-core/types';
import React, { HTMLAttributes } from 'react';

export type AssemblyProps<EditorMode = boolean> = EditorMode extends true
? {
children?: React.ReactNode;
className?: string;
cfHyperlink?: StyleProps['cfHyperlink'];
cfOpenInNewTab?: StyleProps['cfOpenInNewTab'];
editorMode?: EditorMode;
node: ExperienceTreeNode;
resolveDesignValue?: ResolveDesignValueType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
dragProps?: Record<string, any>;
renderDropzone: (
node: ExperienceTreeNode,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
props?: Record<string, any>,
) => React.ReactNode;
}
: // eslint-disable-next-line @typescript-eslint/no-explicit-any
Record<string, any>;
export type AssemblyProps = StructureComponentProps<HTMLAttributes<HTMLDivElement>>;

const assemblyStyle = { display: 'contents' };

// Feel free to do any magic as regards variable definitions for assemblies
// Or if this isn't necessary by the time we figure that part out, we can bid this part farewell
export const Assembly: React.FC<AssemblyProps> = (props) => {
if (props.editorMode) {
const { node, dragProps, ...editorModeProps } = props;

return props.renderDropzone(node, {
...editorModeProps,
['data-test-id']: 'contentful-assembly',
className: props.className,
dragProps,
});
}
// Using a display contents so assembly content/children
// can appear as if they are direct children of the div wrapper's parent
return <div data-test-id="assembly" {...props} style={assemblyStyle} />;
Expand Down
44 changes: 0 additions & 44 deletions packages/components/src/components/Columns/ColumnTypes.ts

This file was deleted.

5 changes: 0 additions & 5 deletions packages/components/src/components/Columns/Columns.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@

.cf-single-column-wrapper {
position: relative;
display: flex;
}

.cf-single-column {
pointer-events: all;
}

.cf-single-column-wrapper:after {
Expand Down
Loading