Skip to content

Commit 58e459f

Browse files
authored
Merge branch 'master' into multiple-elements
2 parents ab35a0f + c12611d commit 58e459f

File tree

5 files changed

+39
-40
lines changed

5 files changed

+39
-40
lines changed

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ Check out the [Envato Tuts+ Startup Series on its codebase](https://code.tutsplu
107107

108108
The [Drupal](https://www.drupal.org/docs/8/core/modules/tour/overview) CMS uses Shepherd to offer tours of it's core modules, and allows developers to add Tours to their custom and contributed modules.
109109

110+
### [Budibase Shepherd Tour Plugin](https://github.com/JayP718/tour_shepherd_bb_plugin)
111+
112+
[Budibase](https://budibase.com/) is an open source application which allows you develop low code applications rapidly and efficiently.This [Budibase](https://budibase.com/) Shepherd tour plugin allows you to create interative walkthroughs for your application.
110113

111114

112115
### Your Project Here

docs-src/tutorials/04-cookbook.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ For example:
3535

3636
```js
3737
floatingUIOptions: {
38-
middlewares: [offset({ mainAxis: 0, crossAxis: 12 })]
38+
middleware: [offset({ mainAxis: 0, crossAxis: 12 })]
3939
}
4040
```
4141

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,29 @@
6666
"cypress": "12.3.0",
6767
"cypress-plugin-tab": "^1.0.5",
6868
"del": "^7.0.0",
69-
"eslint": "^8.31.0",
69+
"eslint": "^8.32.0",
7070
"eslint-config-prettier": "^8.6.0",
7171
"eslint-plugin-jest": "^27.2.1",
7272
"eslint-plugin-prettier": "^4.2.1",
7373
"eslint-plugin-svelte3": "^4.0.0",
74-
"glob": "^8.0.3",
74+
"glob": "^8.1.0",
7575
"http-server": "^14.1.1",
7676
"jest": "^29.3.1",
7777
"jest-environment-jsdom": "^29.3.1",
7878
"jest-expect-message": "^1.1.3",
79-
"jest-transform-css": "^6.0.0",
79+
"jest-transform-css": "^6.0.1",
8080
"jsdoc": "^4.0.0",
8181
"jsdoc-template-ship-shape": "^0.1.1",
8282
"mutationobserver-shim": "^0.3.7",
8383
"postcss": "^8.4.21",
8484
"postinstall-postinstall": "^2.1.0",
85-
"prettier": "^2.8.2",
85+
"prettier": "^2.8.3",
8686
"prettier-plugin-svelte": "^2.7.1",
8787
"release-it": "^15.6.0",
8888
"release-it-lerna-changelog": "^5.0.0",
8989
"replace": "^1.2.2",
9090
"resize-observer-polyfill": "^1.5.1",
91-
"rimraf": "^3.0.2",
91+
"rimraf": "^4.0.7",
9292
"rollup": "^2.79.1",
9393
"rollup-plugin-analyzer": "^4.0.0",
9494
"rollup-plugin-babel": "^4.4.0",
@@ -106,7 +106,7 @@
106106
"rollup-plugin-visualizer": "^5.9.0",
107107
"sinon": "^15.0.1",
108108
"start-server-and-test": "^1.15.2",
109-
"svelte": "^3.55.0",
109+
"svelte": "^3.55.1",
110110
"svelte-jester": "^2.3.2",
111111
"svelte-preprocess": "^5.0.0",
112112
"tailwindcss": "^3.2.4"

src/js/utils/floating-ui.js

+4-13
Original file line numberDiff line numberDiff line change
@@ -154,20 +154,11 @@ function floatingUIposition(step, shouldCenter) {
154154
*/
155155
function placeArrow(el, middlewareData) {
156156
const arrowEl = el.querySelector('.shepherd-arrow');
157-
if (arrowEl) {
158-
let left, top, right, bottom;
159-
160-
if (middlewareData.arrow) {
161-
const { x: arrowX, y: arrowY } = middlewareData.arrow;
162-
left = arrowX != null ? `${arrowX}px` : '';
163-
top = arrowY != null ? `${arrowY}px` : '';
164-
}
165-
157+
if (arrowEl && middlewareData.arrow) {
158+
const { x: arrowX, y: arrowY } = middlewareData.arrow;
166159
Object.assign(arrowEl.style, {
167-
left,
168-
top,
169-
right,
170-
bottom
160+
left: arrowX != null ? `${arrowX}px` : '',
161+
top: arrowY != null ? `${arrowY}px` : ''
171162
});
172163
}
173164
}

yarn.lock

+25-20
Original file line numberDiff line numberDiff line change
@@ -4030,10 +4030,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
40304030
resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
40314031
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
40324032

4033-
eslint@^8.31.0:
4034-
version "8.31.0"
4035-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz#75028e77cbcff102a9feae1d718135931532d524"
4036-
integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==
4033+
eslint@^8.32.0:
4034+
version "8.32.0"
4035+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861"
4036+
integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==
40374037
dependencies:
40384038
"@eslint/eslintrc" "^1.4.1"
40394039
"@humanwhocodes/config-array" "^0.11.8"
@@ -4658,10 +4658,10 @@ glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.2.0:
46584658
once "^1.3.0"
46594659
path-is-absolute "^1.0.0"
46604660

4661-
glob@^8.0.3:
4662-
version "8.0.3"
4663-
resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"
4664-
integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
4661+
glob@^8.1.0:
4662+
version "8.1.0"
4663+
resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
4664+
integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
46654665
dependencies:
46664666
fs.realpath "^1.0.0"
46674667
inflight "^1.0.4"
@@ -5950,10 +5950,10 @@ jest-snapshot@^29.3.1:
59505950
pretty-format "^29.3.1"
59515951
semver "^7.3.5"
59525952

5953-
jest-transform-css@^6.0.0:
5954-
version "6.0.0"
5955-
resolved "https://registry.yarnpkg.com/jest-transform-css/-/jest-transform-css-6.0.0.tgz#f00856827fdcf5ce4e2dbc0f28a297090cae8d8c"
5956-
integrity sha512-63CaM2uT3SrhcniNJvt5bl/uHFfP81f7jLF6hy2yrhAHMfj94WrAg7kOf4JN+vj3NYfnfI542tIvpBTJkHxf6Q==
5953+
jest-transform-css@^6.0.1:
5954+
version "6.0.1"
5955+
resolved "https://registry.yarnpkg.com/jest-transform-css/-/jest-transform-css-6.0.1.tgz#95c579c98945734439c1f243b9843d5f477a9c60"
5956+
integrity sha512-i78Pi2MW6vcdsUFSRx1kPbjbEIO0pBWwh1Y+PcDrLwTv/6e5p7fzsV/gxFW/SYMHS8DUvMdRVTwVCkA/y+t0iQ==
59575957
dependencies:
59585958
common-tags "1.8.2"
59595959
cross-spawn "7.0.3"
@@ -8041,10 +8041,10 @@ prettier-linter-helpers@^1.0.0:
80418041
dependencies:
80428042
fast-diff "^1.1.2"
80438043

8044-
prettier@^2.8.2:
8045-
version "2.8.2"
8046-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.2.tgz#c4ea1b5b454d7c4b59966db2e06ed7eec5dfd160"
8047-
integrity sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==
8044+
prettier@^2.8.3:
8045+
version "2.8.3"
8046+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632"
8047+
integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==
80488048

80498049
prettier-plugin-svelte@^2.7.1:
80508050
version "2.7.1"
@@ -8610,6 +8610,11 @@ rimraf@^3.0.0, rimraf@^3.0.2:
86108610
dependencies:
86118611
glob "^7.1.3"
86128612

8613+
rimraf@^4.0.7:
8614+
version "4.0.7"
8615+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.0.7.tgz#f438c7d6a2d5e5cca1d81e3904a48ac7b053a542"
8616+
integrity sha512-CUEDDrZvc0swDgVdXGiv3FcYYQMpJxjvSGt85Amj6yU+MCVWurrLCeLiJDdJPHCzNJnwuebBEdcO//eP11Xa7w==
8617+
86138618
rollup-plugin-analyzer@^4.0.0:
86148619
version "4.0.0"
86158620
resolved "https://registry.npmjs.org/rollup-plugin-analyzer/-/rollup-plugin-analyzer-4.0.0.tgz"
@@ -9364,10 +9369,10 @@ svelte-preprocess@^5.0.0:
93649369
sorcery "^0.10.0"
93659370
strip-indent "^3.0.0"
93669371

9367-
svelte@^3.55.0:
9368-
version "3.55.0"
9369-
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.0.tgz#29cb958750a23e751309a6535ccd811fcabc9038"
9370-
integrity sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==
9372+
svelte@^3.55.1:
9373+
version "3.55.1"
9374+
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8"
9375+
integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ==
93719376

93729377
svgo@^2.7.0:
93739378
version "2.8.0"

0 commit comments

Comments
 (0)