Skip to content

Commit de97449

Browse files
authored
Merge pull request #9806 from scratchfoundation/feat/uepr-331-face-sensing-callouts
feat: pass feature callout param to gui
2 parents ab8acbd + 315ce85 commit de97449

File tree

4 files changed

+27
-25
lines changed

4 files changed

+27
-25
lines changed

package-lock.json

Lines changed: 23 additions & 22 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
@@ -75,7 +75,7 @@
7575
"@formatjs/intl-numberformat": "8.15.4",
7676
"@formatjs/intl-pluralrules": "5.4.4",
7777
"@formatjs/intl-relativetimeformat": "11.4.11",
78-
"@scratch/scratch-gui": "12.0.0-react-18-face-sensing.2",
78+
"@scratch/scratch-gui": "12.0.0-react-18-face-sensing.3",
7979
"@testing-library/jest-dom": "^5.16.5",
8080
"@testing-library/react": "^14.0.0",
8181
"@testing-library/user-event": "^14.6.1",

src/views/preview/project-view.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,6 +1267,7 @@ class Preview extends React.Component {
12671267
user={this.props.user}
12681268
platform={'WEB'}
12691269
permissions={this.props.permissions}
1270+
showNewFeatureCallouts
12701271
onActivateDeck={this.props.onActivateDeck}
12711272
displayFeedback={this.props.displayFeedback}
12721273
feedback={this.props.feedback}

src/views/preview/project-view.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// directly, and since we have two driverjs instances in the component requiring
66
// different behaviors (one acts like a tooltip, the other like a highlight),
77
// we need to be specific.
8-
.driver-active * {
9-
pointer-events: auto !important;
8+
body.driver-active * {
9+
pointer-events: revert;
1010
}
1111

1212
.driver-active .driver-overlay {

0 commit comments

Comments
 (0)