From 0411c4d07edb11e1efac2b3f3935e0d3f795d4ea Mon Sep 17 00:00:00 2001 From: Jackie Jou Date: Fri, 12 Jun 2026 13:13:45 -0700 Subject: [PATCH 1/2] style(deps): bump activity-feed and threaded-annotations - @box/activity-feed ^1.23.0 -> ^1.25.0 - @box/threaded-annotations ^1.96.1 -> ^1.97.6 - peer requirements of the new versions: @box/blueprint-web ^15.9.0, @box/blueprint-web-assets ^4.125.1, @box/collaboration-popover ^1.64.5, @box/readable-time ^1.43.5, @box/user-selector ^1.78.5 - hide the sidebar content left border behind the v2 activity feed --- package.json | 28 +++---- .../activity-feed-v2/ActivityFeedV2.scss | 4 + yarn.lock | 75 ++++++++++--------- 3 files changed, 56 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 5ad2f8a055..d407e24efc 100644 --- a/package.json +++ b/package.json @@ -124,14 +124,14 @@ "@babel/preset-typescript": "^7.24.7", "@babel/template": "^7.24.7", "@babel/types": "^7.24.7", - "@box/activity-feed": "^1.23.0", - "@box/blueprint-web": "^15.6.0", - "@box/blueprint-web-assets": "^4.123.2", + "@box/activity-feed": "^1.25.0", + "@box/blueprint-web": "^15.9.0", + "@box/blueprint-web-assets": "^4.125.1", "@box/box-ai-agent-selector": "^1.39.21", "@box/box-ai-content-answers": "^1.43.22", "@box/box-item-type-selector": "^1.39.21", "@box/cldr-data": "^34.2.0", - "@box/collaboration-popover": "^1.63.13", + "@box/collaboration-popover": "^1.64.5", "@box/combobox-with-api": "^1.42.22", "@box/content-field": "^1.40.23", "@box/copy-input": "^1.42.16", @@ -142,11 +142,11 @@ "@box/metadata-filter": "^1.80.23", "@box/metadata-view": "^1.53.26", "@box/react-virtualized": "^9.22.3-rc-box.10", - "@box/readable-time": "^1.42.13", - "@box/threaded-annotations": "^1.96.1", + "@box/readable-time": "^1.43.5", + "@box/threaded-annotations": "^1.97.6", "@box/types": "^2.1.8", "@box/unified-share-modal": "^2.15.16", - "@box/user-selector": "^1.77.13", + "@box/user-selector": "^1.78.5", "@box/uploads-manager": "^1.15.0", "@cfaester/enzyme-adapter-react-18": "^0.8.0", "@chromatic-com/storybook": "^4.0.1", @@ -293,14 +293,14 @@ "webpack-dev-server": "^5.2.4" }, "peerDependencies": { - "@box/activity-feed": "^1.23.0", - "@box/blueprint-web": "^15.6.0", - "@box/blueprint-web-assets": "^4.123.2", + "@box/activity-feed": "^1.25.0", + "@box/blueprint-web": "^15.9.0", + "@box/blueprint-web-assets": "^4.125.1", "@box/box-ai-agent-selector": "^1.39.21", "@box/box-ai-content-answers": "^1.43.22", "@box/box-item-type-selector": "^1.39.21", "@box/cldr-data": ">=34.2.0", - "@box/collaboration-popover": "^1.63.13", + "@box/collaboration-popover": "^1.64.5", "@box/combobox-with-api": "^1.42.22", "@box/content-field": "^1.40.23", "@box/copy-input": "^1.42.16", @@ -309,11 +309,11 @@ "@box/metadata-filter": "^1.80.23", "@box/metadata-view": "^1.53.26", "@box/react-virtualized": "^9.22.3-rc-box.10", - "@box/readable-time": "^1.42.13", - "@box/threaded-annotations": "^1.96.1", + "@box/readable-time": "^1.43.5", + "@box/threaded-annotations": "^1.97.6", "@box/types": "^2.1.8", "@box/unified-share-modal": "^2.15.16", - "@box/user-selector": "^1.77.13", + "@box/user-selector": "^1.78.5", "@box/uploads-manager": "^1.15.0", "@hapi/address": "^2.1.4", "@tanstack/react-virtual": "^3.13.12", diff --git a/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss b/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss index 0d9fbac8f0..1a203a3d41 100644 --- a/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss +++ b/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss @@ -62,4 +62,8 @@ // Lets inner ellipsis truncation resolve against the sidebar width. .bcs-NewActivityFeedContent { min-width: 0; + + &.bcs-content { + border-left-color: transparent; + } } diff --git a/yarn.lock b/yarn.lock index f0803fa965..0c6bebe12f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1067,25 +1067,26 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@box/activity-feed@^1.23.0": - version "1.23.0" - resolved "https://registry.yarnpkg.com/@box/activity-feed/-/activity-feed-1.23.0.tgz#64980efe5758e9266f689af7c70a2a987ef4d9fc" - integrity sha512-eyhPp5G+R1uN0VwIwcPbbzxa402nROuTO3ZBFXrLWQVsw/nG3TdNliOJNW09rn6lZ+hddQoSm624vPzy1iITRg== +"@box/activity-feed@^1.25.0": + version "1.25.0" + resolved "https://registry.yarnpkg.com/@box/activity-feed/-/activity-feed-1.25.0.tgz#6d1a258640b73c2532b7f638e11601f863f92648" + integrity sha512-SKABc+nrHnLhxAi6i95Czxv8ays89wTbjoSzmCBfrl61R5iFA4bPvXp2LN0zUP8EyBAnos3rmfzddFrWUpVx1g== -"@box/blueprint-web-assets@^4.123.2": - version "4.123.2" - resolved "https://registry.yarnpkg.com/@box/blueprint-web-assets/-/blueprint-web-assets-4.123.2.tgz#c87aee451b66b0c1ac8f56b5ed75bade9a2b13ba" - integrity sha512-COP0p09ZzwoH4hDGHvG0ZLbkDJ+M4Z42AXmVIZ5dxX8foGXbBp/ioFdH9ctySt/dXL+gsQX6iVvL4wIuQ/XB+g== +"@box/blueprint-web-assets@^4.125.1": + version "4.125.1" + resolved "https://registry.yarnpkg.com/@box/blueprint-web-assets/-/blueprint-web-assets-4.125.1.tgz#c8ff644fa7780b61c2d11037a5dd3d9e4ed78bfd" + integrity sha512-w0pqraVherUVRc+3yvdKCPQ1MRcaa3EJAyCXIXW8YnPg6EqLosnkaps1w9GtAytRhwuDypjYwFIQLFWuSUkMNQ== -"@box/blueprint-web@^15.6.0": - version "15.6.0" - resolved "https://registry.yarnpkg.com/@box/blueprint-web/-/blueprint-web-15.6.0.tgz#30d274e6b3071f2710e31d2e1b7f0004ed29f149" - integrity sha512-AG+do7ouWWT5H6xzqRcryOFGsCbLsjpt5e0lAVuDCiIrC0ADoh7RSioXvmUcLLnss6p20iD7ZNziLGyJ0wv1Qw== +"@box/blueprint-web@^15.9.0": + version "15.9.0" + resolved "https://registry.yarnpkg.com/@box/blueprint-web/-/blueprint-web-15.9.0.tgz#070dbfa1b09ed107f0f8c4d83d788c9bfa6963cf" + integrity sha512-BoNm1A7k0Vgv7KTyIU11yp52pCVXx+qFz1Fb7RmA5M9sNgJTjVCT1Vmf4kENuW/00n0/KIbWMjA1iNAFq97CWg== dependencies: "@ariakit/react" "0.4.21" "@ariakit/react-core" "0.4.21" - "@box/blueprint-web-assets" "^4.123.2" + "@box/blueprint-web-assets" "^4.125.1" "@internationalized/date" "^3.12.0" + "@radix-ui/primitive" "1.0.1" "@radix-ui/react-accordion" "1.1.2" "@radix-ui/react-checkbox" "1.0.4" "@radix-ui/react-collapsible" "1.0.3" @@ -1136,17 +1137,17 @@ resolved "https://registry.yarnpkg.com/@box/cldr-data/-/cldr-data-34.8.0.tgz#36e6ddcea8e20653326aba2e0d13e07f34b7704f" integrity sha512-jsTnhhpFy/eMossMr3cP9+1VFqOxOzO1GX/csw0LzasPl0Dg2Jhn8ypeNTBnFwlOB2Dp6XoxdvQHkBG4eVQe/Q== -"@box/collaboration-popover@^1.63.13": - version "1.63.13" - resolved "https://registry.yarnpkg.com/@box/collaboration-popover/-/collaboration-popover-1.63.13.tgz#dfdd17f785de77b15202294d21a0864a4fcb2349" - integrity sha512-XGO+kkXaXITx1J5q1vRy1vKFw/SE+ZRKLz4FKlmmEYq8MFKX/OHQ7VNXeOq6wP+nZziY7v4LrWQuAcicuu2Y7Q== +"@box/collaboration-popover@^1.64.5": + version "1.64.5" + resolved "https://registry.yarnpkg.com/@box/collaboration-popover/-/collaboration-popover-1.64.5.tgz#a0d610788ad551aea83c7b8ab71d176568b9a43d" + integrity sha512-W41mmnLSArFBLuJwScLEb1dLYabccIukaS2OhUa7/YJewIcC43hOlcYrb2crKNSQiL3B+NIAeuM5U9ZoKyrpmQ== "@box/combobox-with-api@^1.42.22": - version "1.42.22" - resolved "https://registry.yarnpkg.com/@box/combobox-with-api/-/combobox-with-api-1.42.22.tgz#6cd2bc2acbe6baa51e6811f4164f64f2383e793a" - integrity sha512-s+nUdxdyW3PBCSzaOo2SzpUZnc7/l+EBHTXmnLqryOFMOJhLMxQjiKww0JRdU29ck+FQ2xz524gbOOEmlbgvDA== + version "1.46.5" + resolved "https://registry.yarnpkg.com/@box/combobox-with-api/-/combobox-with-api-1.46.5.tgz#5987213bc40b83d6453fc652d2979f78628de333" + integrity sha512-elgLWKplG/hbISrhN2Ke9sB4d7TWeVZsESc2OQX1DwLwUMP2g7tu1ViJrPiJ8lRyFGvftnghIOQNFMtP++1xGg== dependencies: - "@box/tree" "^1.38.22" + "@box/tree" "^1.42.5" react-accessible-treeview "2.9.0" "@box/content-field@^1.40.23": @@ -1205,15 +1206,15 @@ prop-types "^15.7.2" react-lifecycles-compat "^3.0.4" -"@box/readable-time@^1.42.13": - version "1.42.13" - resolved "https://registry.yarnpkg.com/@box/readable-time/-/readable-time-1.42.13.tgz#d951db189723a0da44252751f9c144e254b99398" - integrity sha512-12NBpmobouPib689g1EkUr1eN6FVCl0s/5KEAZWC7+TyIKp+lDaS+YLw8lZ5nb1X3BC4vQAbQ8wS58bkqrEOkA== +"@box/readable-time@^1.43.5": + version "1.43.5" + resolved "https://registry.yarnpkg.com/@box/readable-time/-/readable-time-1.43.5.tgz#a83e554f459f2dfae1774bebc6cac5077e6ecc15" + integrity sha512-FOmeLR/aG+bwYA+nxq9kZd7cA7QW/UPf2l6LlhHjAtDhthODQZj51cuN+LCZO/ikA8sGc5fDV8hDGhraUwl5hg== -"@box/threaded-annotations@^1.96.1": - version "1.96.1" - resolved "https://registry.yarnpkg.com/@box/threaded-annotations/-/threaded-annotations-1.96.1.tgz#bed19c47e70546f5695886ad022daffeebd85873" - integrity sha512-qJXtdqR7GF3+ITg1gv69uFDxsmccozpEfSaehvAFA4Ux2m9fslRmBjKszCyhdLzMmhJ5vIryAvqlzapkLNPq0w== +"@box/threaded-annotations@^1.97.6": + version "1.97.6" + resolved "https://registry.yarnpkg.com/@box/threaded-annotations/-/threaded-annotations-1.97.6.tgz#a9b3de9b4214242c9c959c0f9b80242ee3dceb08" + integrity sha512-OrvI4TjuSKXWwfj5+4s+InGA01ssAXx1GV/jVOUfiKw0w0RpO0fVW5kWdL+Lp5XINNLExcrztNFXfUzabkr5iw== dependencies: "@tanstack/react-virtual" "^3.10.8" "@tiptap/core" "2.0.2" @@ -1227,10 +1228,10 @@ "@tiptap/suggestion" "2.0.2" uuid "^9.0.1" -"@box/tree@^1.38.22": - version "1.38.22" - resolved "https://registry.yarnpkg.com/@box/tree/-/tree-1.38.22.tgz#ac6222ddf7c6fe2e14140a1414c09eddea4667dd" - integrity sha512-NsqPp1qTQc4whngus/WKnc/YF04gIrmXjDdLg6XZFxWjknOUANSDEI5OB1laDVhnQP/QCdaR5V89OqjqExVixA== +"@box/tree@^1.42.5": + version "1.42.5" + resolved "https://registry.yarnpkg.com/@box/tree/-/tree-1.42.5.tgz#85d83fa2e03cce884c91ab95f369d117530e0ac3" + integrity sha512-JQNKalAsMkxMq2aaEObeSDUCQn7GcA9gFgrLK4uSN7/CLUZ5FDo11uwFKDi9P3IM1qP8Tlrq2UIdlPFg0GPxtw== "@box/types@^2.1.8": version "2.1.8" @@ -1247,10 +1248,10 @@ resolved "https://registry.yarnpkg.com/@box/uploads-manager/-/uploads-manager-1.15.0.tgz#59e68734bb2dd0c84b356e3270f7d41e964dcbc9" integrity sha512-pvz8wsZbhfoDK6tPfYl3Yo+48++C9Rcx6NxNVQxeq0dTGCjQeP4z0nLPvEaAGOUDI6osyF31pKSTDhwBSQsM7g== -"@box/user-selector@^1.77.13": - version "1.77.13" - resolved "https://registry.yarnpkg.com/@box/user-selector/-/user-selector-1.77.13.tgz#90476defb0c3999d35d0e84da6a86c18f3d8fcb1" - integrity sha512-naupVQv2GYbSpoI16JN3ZSofIgq8amzOULpJslqedDES9RmkyC97PAh4tckmMmjVMON21AI0Ari7dk4eg255QA== +"@box/user-selector@^1.78.5": + version "1.78.5" + resolved "https://registry.yarnpkg.com/@box/user-selector/-/user-selector-1.78.5.tgz#58df9fc699ca7ea4079ddccacca5f44a8b71fac6" + integrity sha512-9IR0px5/RYuC/tjeoB0xHelnZ6AmdY0aFSQbWirgUHBnuutEmNpGyfvnrQXte22PzUdO9QQXe9ULnERtOuE+Jg== "@bundled-es-modules/cookie@^2.0.1": version "2.0.1" From 2f156a07c5adf2e9ccaeb166d46b31e81fa45d93 Mon Sep 17 00:00:00 2001 From: Jackie Jou Date: Fri, 12 Jun 2026 13:23:14 -0700 Subject: [PATCH 2/2] feat: update style --- .../content-sidebar/activity-feed-v2/ActivityFeedV2.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss b/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss index 1a203a3d41..28f5818466 100644 --- a/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss +++ b/src/elements/content-sidebar/activity-feed-v2/ActivityFeedV2.scss @@ -15,11 +15,6 @@ display: contents; } - &-editor > div { - padding-right: var(--bp-space-040); - padding-left: var(--bp-space-040); - } - // Forms: BUIE sets width, padding, border, box-shadow, border-radius on // contenteditable and inputs via _forms.scss inside .bcs scope. div[contenteditable='true'],