Skip to content

Commit 8a084dd

Browse files
authored
Merge pull request #444 from contentstack/develop_v3
Staging develop_v3
2 parents 4ecd99a + 76bb848 commit 8a084dd

9 files changed

Lines changed: 440 additions & 32 deletions

File tree

.talismanrc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
fileignoreconfig:
2-
- filename: .github/workflows/secrets-scan.yml
3-
ignore_detectors:
4-
- filecontent
5-
- filename: README.md
6-
checksum: 568289bbe7c088967493db246dbf29e465382648ac574c1b1236be57d5662a38
7-
- filename: CHANGELOG.md
8-
checksum: 677807c38f5135fac7ca0377e92953fb09097150ddd3c4f68667fe0368f916ee
9-
- filename: src/visualBuilder/components/__test__/fieldToolbar.test.tsx
10-
checksum: 3badd6a142456b6a361569e6fc546349a38ac6b366bef7fd5255d1e93220444e
11-
version: "1.0"
2+
- filename: .github/workflows/secrets-scan.yml
3+
ignore_detectors:
4+
- filecontent
5+
- filename: README.md
6+
checksum: 568289bbe7c088967493db246dbf29e465382648ac574c1b1236be57d5662a38
7+
- filename: CHANGELOG.md
8+
checksum: 677807c38f5135fac7ca0377e92953fb09097150ddd3c4f68667fe0368f916ee
9+
- filename: src/visualBuilder/components/__test__/fieldToolbar.test.tsx
10+
checksum: 3badd6a142456b6a361569e6fc546349a38ac6b366bef7fd5255d1e93220444e
11+
- filename: src/visualBuilder/components/Collab/ThreadPopup/__test__/CommentTextArea.test.tsx
12+
checksum: d0ef271ee5381d9feab06bda6e7e89bd0a882fee87495627bd811c1f0a5459c7
13+
version: "1.0"

CHANGELOG.md

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,51 @@
11
# Changelog
22

3+
## [v3.2.4](https://github.com/contentstack/live-preview-sdk/compare/v3.2.3...v3.2.4)
4+
5+
> 10 June 2025
6+
7+
### General Changes
8+
9+
- Revert 441 revert 439 collab (diwakarmk7 - [#443](https://github.com/contentstack/live-preview-sdk/pull/443))
10+
11+
### General Changes
12+
13+
- Revert "Revert "Collab"" (diwakarmk7 - [087ab2a](https://github.com/contentstack/live-preview-sdk/commit/087ab2aa818897ce409c61c2472f4b03cbf9762b))
14+
- review comment resolved (diwakarmk7 - [87f990f](https://github.com/contentstack/live-preview-sdk/commit/87f990f9b8e8770ab074dbc5a0624e021e5529fd))
15+
316
## [v3.2.3](https://github.com/contentstack/live-preview-sdk/compare/v3.2.2...v3.2.3)
417

5-
> 28 May 2025
18+
> 29 May 2025
619
720
### Fixes
821

922
- fix: update LightLivePreviewHoC config to use IExportedConfig type (Kirtesh Suthar - [#438](https://github.com/contentstack/live-preview-sdk/pull/438))
1023

24+
### General Changes
25+
26+
- Release version 3.2.3 (Kirtesh Suthar - [#442](https://github.com/contentstack/live-preview-sdk/pull/442))
27+
- Revert "Collab" (diwakarmk7 - [#441](https://github.com/contentstack/live-preview-sdk/pull/441))
28+
- Collab (diwakarmk7 - [#439](https://github.com/contentstack/live-preview-sdk/pull/439))
29+
- Prepare for release from - Develop v3 (Kirtesh Suthar - [#440](https://github.com/contentstack/live-preview-sdk/pull/440))
30+
1131
### Fixes
1232

33+
- fix: update Contentstack Live Preview utils import to version 3.2.3 in README.md (Kirtesh Suthar - [e7da871](https://github.com/contentstack/live-preview-sdk/commit/e7da8715787d6636cff4ad4c09233e57a727af72))
34+
- fix(collab): username display difference fix (diwakarmk7 - [bfc29e3](https://github.com/contentstack/live-preview-sdk/commit/bfc29e36527e62fa682089769bb3653dbc924dbc))
1335
- fix: update checksum for README.md in .talismanrc (Kirtesh Suthar - [45c8c99](https://github.com/contentstack/live-preview-sdk/commit/45c8c9976ae04970a0fcf11dd2fce35f4dee949b))
1436
- fix: update script integrity hash in README.md for Contentstack Live Preview utils (Kirtesh Suthar - [1f024ce](https://github.com/contentstack/live-preview-sdk/commit/1f024ce31c299cd312cfb26ba85498d967f02d25))
1537

1638
### Refactoring and Updates
1739

1840
- refactor: move LightLivePreviewHoC to a new file and simplify index.ts (Kirtesh Suthar - [e248309](https://github.com/contentstack/live-preview-sdk/commit/e248309141411ac1398b7661bdc5bd83dfab8857))
1941

42+
### General Changes
43+
44+
- conflict resolve (diwakarmk7 - [45d4c6f](https://github.com/contentstack/live-preview-sdk/commit/45d4c6f77a05a4a254f9b96624b87a2453f03679))
45+
- added tests for comment text area comp (diwakarmk7 - [2ca321b](https://github.com/contentstack/live-preview-sdk/commit/2ca321b853e524f8d635f6270ca7f26e5bf8807a))
46+
- added tests for comment text area comp (diwakarmk7 - [119fc48](https://github.com/contentstack/live-preview-sdk/commit/119fc48cedaaa67518096595984d6c4b120edaa0))
47+
- popup state fix (diwakarmk7 - [0f8dcf1](https://github.com/contentstack/live-preview-sdk/commit/0f8dcf1df32a52ffff9e1a168200c28f085bee2f))
48+
2049
## [v3.2.2](https://github.com/contentstack/live-preview-sdk/compare/v3.2.1...v3.2.2)
2150

2251
> 16 May 2025
@@ -347,7 +376,7 @@
347376
- jira.yml (Aravind Kumar - [30e4861](https://github.com/contentstack/live-preview-sdk/commit/30e4861e33d5f7c89cffef109e50aa811f6b346a))
348377
- sca-scan.yml (Aravind Kumar - [bcb5ca8](https://github.com/contentstack/live-preview-sdk/commit/bcb5ca8a3a820fab6199166882ae80e8438a074d))
349378

350-
## [v3.1.0](https://github.com/contentstack/live-preview-sdk/compare/v3.0.3...v3.1.0)
379+
## [v3.1.0](https://github.com/contentstack/live-preview-sdk/compare/v3.0.2...v3.1.0)
351380

352381
> 16 January 2025
353382
@@ -395,9 +424,9 @@
395424
- test: update mock type casting in visual builder tests (hiteshshetty-dev - [a2d4397](https://github.com/contentstack/live-preview-sdk/commit/a2d4397f53f114e5c7d19e3c0ea2329581e1009f))
396425
- test: enable number field test suite in visual builder input tests (hiteshshetty-dev - [0f59956](https://github.com/contentstack/live-preview-sdk/commit/0f5995635cb1cf29ccdac1ec45b1288b6d494e2d))
397426

398-
## [v3.0.3](https://github.com/contentstack/live-preview-sdk/compare/v3.0.2...v3.0.3)
427+
## [v3.0.2](https://github.com/contentstack/live-preview-sdk/compare/v3.0.1...v3.0.2)
399428

400-
> 7 January 2025
429+
> 3 January 2025
401430
402431
### Fixes
403432

@@ -443,14 +472,6 @@
443472
- Merge pull request #308 from contentstack/VE-4326 (Sairaj - [1b5cde7](https://github.com/contentstack/live-preview-sdk/commit/1b5cde7de17ebf6d9c26facb3f155ce7d4baae0f))
444473
- Merge pull request #301 from contentstack/VE-4009-pseudo-multiple (Sairaj - [e8c6080](https://github.com/contentstack/live-preview-sdk/commit/e8c608078df7256d1634175f81c9928612b0d9b8))
445474

446-
## [v3.0.2](https://github.com/contentstack/live-preview-sdk/compare/v3.0.1...v3.0.2)
447-
448-
> 7 January 2025
449-
450-
### New Features
451-
452-
- feat: added changelog flow (Kirtesh Suthar - [ff5c822](https://github.com/contentstack/live-preview-sdk/commit/ff5c82244b126dbc4c4545be6025950bb2cf9421))
453-
454475
## [v3.0.1](https://github.com/contentstack/live-preview-sdk/compare/v3.0.0...v3.0.1)
455476

456477
> 15 November 2024
@@ -1081,7 +1102,6 @@
10811102
10821103
### Fixes
10831104

1084-
- fix: add version bump in package json (Kirtesh Suthar - [#142](https://github.com/contentstack/live-preview-sdk/pull/142))
10851105
- fix: edit button was removed from document (Mridul Sharma - [#135](https://github.com/contentstack/live-preview-sdk/pull/135))
10861106
- fix: removed headers key from SDK init data (Mridul Sharma - [#132](https://github.com/contentstack/live-preview-sdk/pull/132))
10871107

@@ -1106,6 +1126,10 @@
11061126

11071127
> 18 June 2024
11081128
1129+
### Fixes
1130+
1131+
- fix: add version bump in package json (Kirtesh Suthar - [#142](https://github.com/contentstack/live-preview-sdk/pull/142))
1132+
11091133
### General Changes
11101134

11111135
- Update README.md (Kirtesh Suthar - [#141](https://github.com/contentstack/live-preview-sdk/pull/141))

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Alternatively, if you want to include the package directly in your website HTML
1616

1717
```html
1818
<script type='module' integrity='sha384-b6G+ggU20rGxqCqsgaS6zludFgj5N11xsuXhMEIARMuQY2PtyDS04TU0H5goP+32' crossorigin="anonymous">
19-
import ContentstackLivePreview from 'https://esm.sh/@contentstack/live-preview-utils@3.2.3';
19+
import ContentstackLivePreview from 'https://esm.sh/@contentstack/live-preview-utils@3.2.4';
2020
2121
ContentstackLivePreview.init({
2222
stackDetails: {

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/live-preview-utils",
3-
"version": "3.2.3",
3+
"version": "3.2.4",
44
"description": "Contentstack provides the Live Preview SDK to establish a communication channel between the various Contentstack SDKs and your website, transmitting live changes to the preview pane.",
55
"type": "module",
66
"types": "dist/legacy/index.d.ts",

src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,22 @@ const MentionSuggestionsList: React.FC<{
102102
tabIndex={-1}
103103
aria-selected={index === selectedIndex}
104104
>
105-
{(user.display?.length || 0) > 20 ? (
106-
<Tooltip content={user.display || ""}>
107-
{(user.display || "").substring(0, 18) + "..."}
108-
</Tooltip>
105+
{user.display === user.email ? (
106+
user.display.length > 20 ? (
107+
<Tooltip content={user.display || ""}>
108+
{(user.display || "").substring(0, 18) + "..."}
109+
</Tooltip>
110+
) : (
111+
user.display
112+
)
109113
) : (
110-
user.display || ""
114+
<Tooltip
115+
content={user.display + " - " + user.email || ""}
116+
>
117+
{user.display.length > 20
118+
? (user.display || "").substring(0, 18) + "..."
119+
: user.display}
120+
</Tooltip>
111121
)}
112122
</li>
113123
))}

0 commit comments

Comments
 (0)