Skip to content

Commit 044dddf

Browse files
committed
Revert "Try out Floating UI"
This reverts commit 63f87f7.
1 parent 46a70f7 commit 044dddf

File tree

5 files changed

+4
-121
lines changed

5 files changed

+4
-121
lines changed

lib/KTooltip/next/index.vue

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
2727
import { onMounted, onUnmounted, ref, watch, nextTick } from 'vue';
2828
import useKFloatingInteraction from '../../composables/useKFloatingInteraction';
29-
/* import useKFloatingPosition from '../../composables/useKFloatingPosition'; */
30-
// Floating UI versions
31-
import useKFloatingPosition from '../../composables/useKFloatingPosition2';
29+
import useKFloatingPosition from '../../composables/useKFloatingPosition';
3230
import _useOverlay from '../../composables/_useOverlay';
3331
import { getPositionOptions } from './positionOptions';
3432
@@ -46,11 +44,7 @@
4644
props.activateOn,
4745
props.delegateTo,
4846
);
49-
50-
/* const { initPosition, disablePosition, destroyPosition } = useKFloatingPosition(); */
51-
52-
// Floating UI
53-
const { initPosition, destroyPosition } = useKFloatingPosition();
47+
const { initPosition, disablePosition, destroyPosition } = useKFloatingPosition();
5448
5549
const options = getPositionOptions(positionOptions, placement);
5650
@@ -90,10 +84,7 @@
9084
});
9185
}, 250);
9286
} else {
93-
/* disablePosition(tooltipId); */
94-
95-
// Floating UI version
96-
destroyPosition(tooltipId);
87+
disablePosition(tooltipId);
9788
}
9889
}
9990

lib/KTooltip/next/positionOptions.js

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Popper 2 options
22
// https://popper.js.org/docs/v2/constructors/#options
3-
/* const DEFAULT_POSITION_OPTIONS = {
3+
const DEFAULT_POSITION_OPTIONS = {
44
placement: 'bottom',
55
modifiers: [
66
{
@@ -22,32 +22,6 @@
2222
},
2323
},
2424
],
25-
}; */
26-
27-
// Floating UI version
28-
// https://floating-ui.com/docs/position
29-
// Since it's not possible to use an object to configure
30-
// options anymore, customizing KTooltip, and any other
31-
// future floating elements, from components that call them
32-
// would most likely be fairly cumbersome and harder to abstract
33-
// from the library. We could implement some logic to make it
34-
// easier, but from the principle it will be more complex
35-
// than simply using Popper 2 configuration object.
36-
import { offset, flip, shift } from '@floating-ui/dom';
37-
38-
const DEFAULT_POSITION_OPTIONS = {
39-
placement: 'bottom',
40-
middleware: [
41-
offset({
42-
mainAxis: 8,
43-
}),
44-
flip({
45-
fallbackPlacements: ['top'],
46-
}),
47-
shift({
48-
padding: 8,
49-
}),
50-
],
5125
};
5226

5327
/**

lib/composables/useKFloatingPosition2.js

Lines changed: 0 additions & 61 deletions
This file was deleted.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"lib"
2929
],
3030
"dependencies": {
31-
"@floating-ui/dom": "^1.7.4",
3231
"@popperjs/core": "^2.11.8",
3332
"aphrodite": "https://github.com/learningequality/aphrodite/",
3433
"autosize": "3.0.21",

yarn.lock

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,26 +1374,6 @@
13741374
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
13751375
integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
13761376

1377-
"@floating-ui/core@^1.7.3":
1378-
version "1.7.3"
1379-
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.7.3.tgz#462d722f001e23e46d86fd2bd0d21b7693ccb8b7"
1380-
integrity sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==
1381-
dependencies:
1382-
"@floating-ui/utils" "^0.2.10"
1383-
1384-
"@floating-ui/dom@^1.7.4":
1385-
version "1.7.4"
1386-
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.4.tgz#ee667549998745c9c3e3e84683b909c31d6c9a77"
1387-
integrity sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==
1388-
dependencies:
1389-
"@floating-ui/core" "^1.7.3"
1390-
"@floating-ui/utils" "^0.2.10"
1391-
1392-
"@floating-ui/utils@^0.2.10":
1393-
version "0.2.10"
1394-
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.10.tgz#a2a1e3812d14525f725d011a73eceb41fef5bc1c"
1395-
integrity sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==
1396-
13971377
"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
13981378
version "1.1.3"
13991379
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"

0 commit comments

Comments
 (0)