@@ -83,14 +83,14 @@ class Se {
83
83
if ( i && / d a t a - v e l - d a t a - .+ / gi. test ( i ) ) {
84
84
const n = t . target , r = n . dataset . velPluginId || "" , u = n . dataset . velPlugin || "" , h = n . dataset . velView || "" , c = n . getAttribute ( i ) ;
85
85
if ( c && c !== t . oldValue ) {
86
- const _ = Le (
86
+ const g = Le (
87
87
i . replace ( "data-vel-data-" , "" )
88
88
) ;
89
89
this . _eventBus . emitEvent ( fe , {
90
90
pluginId : r ,
91
91
pluginName : u ,
92
92
viewName : h ,
93
- dataName : _ ,
93
+ dataName : g ,
94
94
dataValue : c
95
95
} ) ;
96
96
}
@@ -109,6 +109,9 @@ class he extends Fe {
109
109
a ( this , "_handler" ) ;
110
110
this . _handler = t ;
111
111
}
112
+ getHandler ( ) {
113
+ return this . _handler ;
114
+ }
112
115
call ( t ) {
113
116
this . _handler ( t ) ;
114
117
}
@@ -126,12 +129,31 @@ class k {
126
129
let s = this . _listeners . get ( e ) ;
127
130
s || ( s = [ ] , this . _listeners . set ( e , s ) ) , s . push ( new he ( t ) ) ;
128
131
}
132
+ removeEventListener ( e , t , i ) {
133
+ if ( i ) {
134
+ this . _removeKeyedEventListener ( e , t , i ) ;
135
+ return ;
136
+ }
137
+ let s = this . _listeners . get ( e ) ;
138
+ s && ( s = s . filter (
139
+ ( n ) => n . getHandler ( ) !== t
140
+ ) , this . _listeners . set ( e , s ) ) ;
141
+ }
129
142
_subscribeToKeyedEvent ( e , t , i ) {
130
143
let s = this . _keyedListeners . get ( e ) ;
131
144
s || ( s = /* @__PURE__ */ new Map ( ) , this . _keyedListeners . set ( e , s ) ) ;
132
145
let n = s . get ( i ) ;
133
146
n || ( n = [ ] , s . set ( i , n ) ) , n . push ( new he ( t ) ) ;
134
147
}
148
+ _removeKeyedEventListener ( e , t , i ) {
149
+ let s = this . _keyedListeners . get ( e ) ;
150
+ if ( ! s )
151
+ return ;
152
+ let n = s . get ( i ) ;
153
+ n && ( n = n . filter (
154
+ ( r ) => r . getHandler ( ) !== t
155
+ ) , s . set ( i , n ) ) ;
156
+ }
135
157
emitEvent ( e , t , i ) {
136
158
if ( i ) {
137
159
this . _emitKeyedEvent ( e , t , i ) ;
@@ -164,7 +186,7 @@ class k {
164
186
return ;
165
187
}
166
188
this . subscribeToEvent (
167
- ge ,
189
+ _e ,
168
190
this . _convertListener ( e ) ,
169
191
t
170
192
) ;
@@ -179,7 +201,7 @@ class k {
179
201
return ;
180
202
}
181
203
this . emitEvent (
182
- ge ,
204
+ _e ,
183
205
t ,
184
206
e
185
207
) ;
@@ -260,6 +282,9 @@ class ve {
260
282
on ( e , t ) {
261
283
this . _internalEventBus . subscribeToEvent ( e , t ) ;
262
284
}
285
+ removeListener ( e , t ) {
286
+ this . _internalEventBus . removeEventListener ( e , t ) ;
287
+ }
263
288
useEventPlugin ( e , t = { } ) {
264
289
const i = this . _registry . createPlugin (
265
290
e ,
@@ -498,8 +523,8 @@ function ze(o, e, t, i, s) {
498
523
return ( o - e ) / ( t - e ) * ( s - i ) + i ;
499
524
}
500
525
function We ( o , e , t ) {
501
- const i = e . getScroll ( ) , s = e . position . x - i . x , n = e . position . y - i . y , r = o . x || s , u = o . y || n , h = Math . abs ( s - r ) , c = Math . abs ( n - u ) , _ = Math . sqrt ( h * h + c * c ) ;
502
- return 1 - we ( 0 , _ / t , 1 ) ;
526
+ const i = e . getScroll ( ) , s = e . position . x - i . x , n = e . position . y - i . y , r = o . x || s , u = o . y || n , h = Math . abs ( s - r ) , c = Math . abs ( n - u ) , g = Math . sqrt ( h * h + c * c ) ;
527
+ return 1 - we ( 0 , g / t , 1 ) ;
503
528
}
504
529
function m ( o ) {
505
530
let e = o . match ( / ^ ( [ \d . ] + ) ( [ a - z A - Z % ] * ) $ / ) ;
@@ -599,8 +624,8 @@ function qe(o, e) {
599
624
h : m ( `${ u . value } %` ) ,
600
625
v : m ( `${ u . value } %` )
601
626
} ;
602
- const c = u . value / h . width * 100 , _ = u . value / h . height * 100 ;
603
- return { h : m ( `${ c } %` ) , v : m ( `${ _ } %` ) } ;
627
+ const c = u . value / h . width * 100 , g = u . value / h . height * 100 ;
628
+ return { h : m ( `${ c } %` ) , v : m ( `${ g } %` ) } ;
604
629
}
605
630
}
606
631
function de ( o , e ) {
@@ -761,9 +786,9 @@ class et extends X {
761
786
class tt extends X {
762
787
update ( { animatorProp : e , current : t , target : i , dt : s } ) {
763
788
return i . map ( ( n , r ) => {
764
- const u = t [ r ] , h = n . value === 0 ? u . unit : n . unit , _ = ( n . value - u . value ) * this . _config . speed , g = u . value + _ * s ;
765
- let d = m ( `${ g } ${ h } ` ) ;
766
- return this . _shouldFinish ( n . value , u . value , _ ) && ( d = n , requestAnimationFrame ( ( ) => {
789
+ const u = t [ r ] , h = n . value === 0 ? u . unit : n . unit , g = ( n . value - u . value ) * this . _config . speed , _ = u . value + g * s ;
790
+ let d = m ( `${ _ } ${ h } ` ) ;
791
+ return this . _shouldFinish ( n . value , u . value , g ) && ( d = n , requestAnimationFrame ( ( ) => {
767
792
e . callCompleteCallback ( ) ;
768
793
} ) ) , e . callUpdateCallback ( ) , d ;
769
794
} ) ;
@@ -848,10 +873,10 @@ class nt extends K {
848
873
}
849
874
update ( { animatorProp : t , current : i , target : s , dt : n } ) {
850
875
return s . map ( ( r , u ) => {
851
- const h = i [ u ] , c = r . value === 0 ? h . unit : r . unit , _ = - ( h . value - r . value ) * this . _config . stiffness ;
852
- this . _velocity += _ , this . _velocity *= this . _config . damping ;
853
- const g = h . value + this . _velocity * n * this . _config . speed ;
854
- let d = m ( `${ g } ${ c } ` ) ;
876
+ const h = i [ u ] , c = r . value === 0 ? h . unit : r . unit , g = - ( h . value - r . value ) * this . _config . stiffness ;
877
+ this . _velocity += g , this . _velocity *= this . _config . damping ;
878
+ const _ = h . value + this . _velocity * n * this . _config . speed ;
879
+ let d = m ( `${ _ } ${ c } ` ) ;
855
880
return this . _shouldFinish ( r . value , h . value ) && ( d = r , requestAnimationFrame ( ( ) => {
856
881
t . callCompleteCallback ( ) ;
857
882
} ) ) , d ;
@@ -901,8 +926,8 @@ class ot extends Z {
901
926
return p ( n , 1 ) ? ( requestAnimationFrame ( ( ) => {
902
927
e . callCompleteCallback ( ) ;
903
928
} ) , i ) : t . map ( ( r , u ) => {
904
- const h = i [ u ] , c = h . value === 0 ? r . unit : h . unit , _ = r . value + this . _config . ease ( n ) * ( i [ u ] . value - r . value ) ;
905
- return m ( `${ _ } ${ c } ` ) ;
929
+ const h = i [ u ] , c = h . value === 0 ? r . unit : h . unit , g = r . value + this . _config . ease ( n ) * ( i [ u ] . value - r . value ) ;
930
+ return m ( `${ g } ${ c } ` ) ;
906
931
} ) ;
907
932
}
908
933
}
@@ -961,7 +986,7 @@ class lt extends J {
961
986
return new nt ( { ...H , ...e } ) ;
962
987
}
963
988
}
964
- class _e extends J {
989
+ class ge extends J {
965
990
createInstantAnimator ( ) {
966
991
return new j ( ) ;
967
992
}
@@ -1240,7 +1265,7 @@ class dt extends V {
1240
1265
return ! 1 ;
1241
1266
}
1242
1267
}
1243
- class _t extends V {
1268
+ class gt extends V {
1244
1269
get x ( ) {
1245
1270
return this . _currentValue . x ;
1246
1271
}
@@ -1287,7 +1312,7 @@ class _t extends V {
1287
1312
return ! 1 ;
1288
1313
}
1289
1314
}
1290
- class gt extends V {
1315
+ class _t extends V {
1291
1316
constructor ( ) {
1292
1317
super ( ...arguments ) ;
1293
1318
a ( this , "_animateLayoutUpdateNextFrame" , ! 1 ) ;
@@ -1335,8 +1360,8 @@ class gt extends V {
1335
1360
}
1336
1361
update ( t , i ) {
1337
1362
if ( ( this . _view . isInverseEffectEnabled || this . _view . isLayoutTransitionEnabled ) && ! this . _view . isTemporaryView && this . _runLayoutTransition ( ) , this . _view . isInverseEffectEnabled ) {
1338
- const c = this . _view . _parent , _ = c ? c . scale . x : 1 , g = c ? c . scale . y : 1 ;
1339
- this . _parentScaleInverse = new l ( 1 / _ , 1 / g ) , this . _parentScaleInverse . equals ( new l ( 1 , 1 ) ) || ( this . _hasChanged = ! 0 ) ;
1363
+ const c = this . _view . _parent , g = c ? c . scale . x : 1 , _ = c ? c . scale . y : 1 ;
1364
+ this . _parentScaleInverse = new l ( 1 / g , 1 / _ ) , this . _parentScaleInverse . equals ( new l ( 1 , 1 ) ) || ( this . _hasChanged = ! 0 ) ;
1340
1365
}
1341
1366
if ( this . _targetValue . x === this . _currentValue . x && this . _targetValue . y === this . _currentValue . y )
1342
1367
return ;
@@ -1363,9 +1388,9 @@ class gt extends V {
1363
1388
const t = ! ( this . _targetValue . x === this . _currentValue . x && this . _targetValue . y === this . _currentValue . y ) , i = ! ( this . _view . scale . _targetValue . x === this . _view . scale . _currentValue . x && this . _view . scale . _targetValue . y === this . _view . scale . _currentValue . y ) , s = t || i , n = this . _rect . pageOffset . left - this . _previousRect . pageOffset . left , r = this . _rect . pageOffset . top - this . _previousRect . pageOffset . top , u = this . _previousRect . size . width / this . _rect . size . width , h = this . _previousRect . size . height / this . _rect . size . height ;
1364
1389
let c = ! 1 ;
1365
1390
if ( n !== 0 || r !== 0 || ! Number . isNaN ( u ) && u !== 1 || ! Number . isNaN ( h ) && h !== 1 ? c = ! 0 : c = ( ( ) => {
1366
- const _ = this . _view . _parents ;
1367
- for ( let g = 0 ; g < _ . length ; g ++ ) {
1368
- const d = _ [ g ] , f = d . previousRect . size . width / d . rect . size . width , v = d . previousRect . size . height / d . rect . size . height ;
1391
+ const g = this . _view . _parents ;
1392
+ for ( let _ = 0 ; _ < g . length ; _ ++ ) {
1393
+ const d = g [ _ ] , f = d . previousRect . size . width / d . rect . size . width , v = d . previousRect . size . height / d . rect . size . height ;
1369
1394
if ( f !== 1 || v !== 1 )
1370
1395
return ! 0 ;
1371
1396
}
@@ -1403,14 +1428,14 @@ class gt extends V {
1403
1428
return ;
1404
1429
}
1405
1430
this . _animateLayoutUpdateNextFrame = ! 0 ;
1406
- const _ = this . _previousRect , g = this . _rect , d = this . _view . _parent ;
1431
+ const g = this . _previousRect , _ = this . _rect , d = this . _view . _parent ;
1407
1432
let f = 0 , v = 0 ;
1408
1433
d && d . position . animator . name !== "instant" && ( f = d . previousRect . viewportOffset . left - d . rect . viewportOffset . left ) , d && d . position . animator . name !== "instant" && ( v = d . previousRect . viewportOffset . top - d . rect . viewportOffset . top ) ;
1409
1434
let y = 1 , F = 1 ;
1410
1435
d && d . scale . animator . name !== "instant" && ( y = d . previousRect . size . width / d . rect . size . width , F = d . previousRect . size . height / d . rect . size . height ) ;
1411
- const ye = d && d . position . animator . name !== "instant" ? d . previousRect . viewportOffset . left : 0 , Ve = d && d . position . animator . name !== "instant" ? d . previousRect . viewportOffset . top : 0 , ee = _ . viewportOffset . left - ye , te = _ . viewportOffset . top - Ve , Pe = ee / y - ee , be = te / F - te ;
1412
- let Re = _ . viewportOffset . left - g . viewportOffset . left - f + Pe ;
1413
- const xe = _ . viewportOffset . top - g . viewportOffset . top - v + be ;
1436
+ const ye = d && d . position . animator . name !== "instant" ? d . previousRect . viewportOffset . left : 0 , Ve = d && d . position . animator . name !== "instant" ? d . previousRect . viewportOffset . top : 0 , ee = g . viewportOffset . left - ye , te = g . viewportOffset . top - Ve , Pe = ee / y - ee , be = te / F - te ;
1437
+ let Re = g . viewportOffset . left - _ . viewportOffset . left - f + Pe ;
1438
+ const xe = g . viewportOffset . top - _ . viewportOffset . top - v + be ;
1414
1439
this . _setTarget ( new l ( Re , xe ) , ! 1 ) ;
1415
1440
} else
1416
1441
this . _animateLayoutUpdateNextFrame && ( this . _setTarget ( this . _initialValue , ! 0 ) , this . _animateLayoutUpdateNextFrame = ! 1 ) ;
@@ -1532,9 +1557,9 @@ class ft extends V {
1532
1557
let n = ! 1 ;
1533
1558
if ( ( ! Number . isNaN ( i ) && i !== 1 || ! Number . isNaN ( s ) && s !== 1 ) && ( n = ! 0 ) , n ) {
1534
1559
if ( this . _currentValue . x !== 1 || this . _currentValue . y !== 1 ) {
1535
- const _ = this . _view . previousRect . size . width / this . _view . rect . size . width , g = this . _view . previousRect . size . height / this . _view . rect . size . height ;
1560
+ const g = this . _view . previousRect . size . width / this . _view . rect . size . width , _ = this . _view . previousRect . size . height / this . _view . rect . size . height ;
1536
1561
this . _setTarget (
1537
- new l ( this . _currentValue . x * _ , this . _currentValue . y * g ) ,
1562
+ new l ( this . _currentValue . x * g , this . _currentValue . y * _ ) ,
1538
1563
! 1
1539
1564
) , t && ( this . _animateLayoutUpdateNextFrame = ! 0 ) ;
1540
1565
return ;
@@ -1652,13 +1677,13 @@ class vt {
1652
1677
a ( this , "_props" , /* @__PURE__ */ new Map ( ) ) ;
1653
1678
this . _props . set (
1654
1679
"position" ,
1655
- new gt ( new I ( ) , new l ( 0 , 0 ) , e )
1680
+ new _t ( new I ( ) , new l ( 0 , 0 ) , e )
1656
1681
) , this . _props . set (
1657
1682
"scale" ,
1658
1683
new ft ( new I ( ) , new l ( 1 , 1 ) , e )
1659
1684
) , this . _props . set (
1660
1685
"rotation" ,
1661
- new pt ( new _e ( ) , 0 , e )
1686
+ new pt ( new ge ( ) , 0 , e )
1662
1687
) , this . _props . set (
1663
1688
"size" ,
1664
1689
new mt (
@@ -1669,7 +1694,7 @@ class vt {
1669
1694
) , this . _props . set (
1670
1695
"opacity" ,
1671
1696
new dt (
1672
- new _e ( ) ,
1697
+ new ge ( ) ,
1673
1698
e . elementReader . opacity . value ,
1674
1699
e
1675
1700
)
@@ -1687,7 +1712,7 @@ class vt {
1687
1712
)
1688
1713
) , this . _props . set (
1689
1714
"origin" ,
1690
- new _t (
1715
+ new gt (
1691
1716
new I ( ) ,
1692
1717
e . elementReader . origin . value ,
1693
1718
e
@@ -2041,8 +2066,8 @@ class yt {
2041
2066
h
2042
2067
) ;
2043
2068
this . _plugins . push ( c ) ;
2044
- const _ = s . dataset . velView , g = this . _createNewView ( s , _ , c ) ;
2045
- g . isInverseEffectEnabled && g . setAnimatorsFromParent ( ) , c . notifyAboutViewAdded ( g ) ;
2069
+ const g = s . dataset . velView , _ = this . _createNewView ( s , g , c ) ;
2070
+ _ . isInverseEffectEnabled && _ . setAnimatorsFromParent ( ) , c . notifyAboutViewAdded ( _ ) ;
2046
2071
} ) ;
2047
2072
const i = t . filter ( ( s ) => ! ! this . _getPluginIdForElement ( s ) ) ;
2048
2073
i . length !== 0 && i . forEach ( ( s ) => {
@@ -2244,13 +2269,13 @@ class yt {
2244
2269
h
2245
2270
) ;
2246
2271
this . _plugins . push ( c ) ;
2247
- let _ = [ ] ;
2248
- u !== document . documentElement && _ . push ( u ) ;
2249
- const g = u . querySelectorAll (
2272
+ let g = [ ] ;
2273
+ u !== document . documentElement && g . push ( u ) ;
2274
+ const _ = u . querySelectorAll (
2250
2275
`[data-vel-plugin=${ c . pluginName } ]`
2251
2276
) ;
2252
- _ = [ ..._ , ...g ] ;
2253
- const d = _ . filter ( ( f ) => {
2277
+ g = [ ...g , ..._ ] ;
2278
+ const d = g . filter ( ( f ) => {
2254
2279
if ( ! f . parentElement )
2255
2280
return ! 0 ;
2256
2281
const y = this . _getPluginNameForElement ( f . parentElement ) ;
@@ -2300,7 +2325,7 @@ class yt {
2300
2325
) ;
2301
2326
}
2302
2327
}
2303
- class ge {
2328
+ class _e {
2304
2329
constructor ( e ) {
2305
2330
a ( this , "pluginApi" ) ;
2306
2331
this . pluginApi = e . pluginApi ;
@@ -2354,6 +2379,10 @@ class Q {
2354
2379
const s = this . _registry . getPluginByName ( e . pluginName ) ;
2355
2380
s && s . on ( t , i ) ;
2356
2381
}
2382
+ removePluginEventListener ( e , t , i ) {
2383
+ const s = this . _registry . getPluginByName ( e . pluginName ) ;
2384
+ s && s . removeListener ( t , i ) ;
2385
+ }
2357
2386
run ( ) {
2358
2387
document . readyState === "loading" ? document . addEventListener ( "DOMContentLoaded" , this . _start . bind ( this ) ) : this . _start ( ) ;
2359
2388
}
@@ -2514,7 +2543,7 @@ class Pt extends q {
2514
2543
} ) ;
2515
2544
}
2516
2545
_emitEvent ( t , i ) {
2517
- const s = this . _viewPointerPositionLog . get ( t . id ) , n = s && s . length >= 2 ? s [ s . length - 2 ] : null , r = this . _pointerX - this . _initialPointerPerView . get ( t . id ) . x , u = this . _pointerY - this . _initialPointerPerView . get ( t . id ) . y , h = n ? n . x - this . _initialPointerPerView . get ( t . id ) . x : r , c = n ? n . y - this . _initialPointerPerView . get ( t . id ) . y : u , _ = this . _pointerY - this . _initialPointer . y , g = this . _pointerX - this . _initialPointer . x , d = this . _targetPerView . get ( t . id ) ;
2546
+ const s = this . _viewPointerPositionLog . get ( t . id ) , n = s && s . length >= 2 ? s [ s . length - 2 ] : null , r = this . _pointerX - this . _initialPointerPerView . get ( t . id ) . x , u = this . _pointerY - this . _initialPointerPerView . get ( t . id ) . y , h = n ? n . x - this . _initialPointerPerView . get ( t . id ) . x : r , c = n ? n . y - this . _initialPointerPerView . get ( t . id ) . y : u , g = this . _pointerY - this . _initialPointer . y , _ = this . _pointerX - this . _initialPointer . x , d = this . _targetPerView . get ( t . id ) ;
2518
2547
if ( ! d || ! t . hasElement ( d ) )
2519
2548
return ;
2520
2549
const f = this . _pointerDownPerView . get ( t . id ) === ! 0 ;
@@ -2526,8 +2555,8 @@ class Pt extends q {
2526
2555
previousY : c ,
2527
2556
x : r ,
2528
2557
y : u ,
2529
- width : g ,
2530
- height : _ ,
2558
+ width : _ ,
2559
+ height : g ,
2531
2560
isDragging : f ,
2532
2561
directions : i
2533
2562
} ;
@@ -2591,10 +2620,10 @@ class Rt extends q {
2591
2620
this . getViews ( ) . forEach ( ( r ) => {
2592
2621
if ( ! this . _viewIsPointerDownMap . get ( r . id ) || ! this . _viewPointerPositionLog . has ( r . id ) )
2593
2622
return ;
2594
- const u = new l ( i , s ) , h = this . _viewPointerPositionLog . get ( r . id ) , c = h [ h . length - 2 ] || u . clone ( ) , _ = this . _targetPerView . get ( r . id ) , g = n ( c , u ) ;
2595
- _ && r . hasElement ( _ ) && g . hasSwiped && this . emit ( bt , {
2623
+ const u = new l ( i , s ) , h = this . _viewPointerPositionLog . get ( r . id ) , c = h [ h . length - 2 ] || u . clone ( ) , g = this . _targetPerView . get ( r . id ) , _ = n ( c , u ) ;
2624
+ g && r . hasElement ( g ) && _ . hasSwiped && this . emit ( bt , {
2596
2625
view : r ,
2597
- direction : g . direction
2626
+ direction : _ . direction
2598
2627
} ) , this . _viewPointerPositionLog . set ( r . id , [ ] ) , this . _viewIsPointerDownMap . set ( r . id , ! 1 ) ;
2599
2628
} ) ;
2600
2629
function n ( r , u ) {
@@ -2603,17 +2632,17 @@ class Rt extends q {
2603
2632
down : l . sub ( new l ( r . x , r . y + 1 ) , r ) ,
2604
2633
left : l . sub ( new l ( r . x - 1 , r . y ) , r ) ,
2605
2634
right : l . sub ( new l ( r . x + 1 , r . y ) , r )
2606
- } , c = l . sub ( u , r ) . unitVector , _ = [
2635
+ } , c = l . sub ( u , r ) . unitVector , g = [
2607
2636
"up" ,
2608
2637
"down" ,
2609
2638
"left" ,
2610
2639
"right"
2611
- ] , g = [
2640
+ ] , _ = [
2612
2641
c . dot ( h . up ) ,
2613
2642
c . dot ( h . down ) ,
2614
2643
c . dot ( h . left ) ,
2615
2644
c . dot ( h . right )
2616
- ] , d = Math . max ( ...g ) , f = g . indexOf ( d ) , v = _ [ f ] , y = l . sub ( u , r ) . magnitude ;
2645
+ ] , d = Math . max ( ..._ ) , f = _ . indexOf ( d ) , v = g [ f ] , y = l . sub ( u , r ) . magnitude ;
2617
2646
return {
2618
2647
hasSwiped : c . dot ( h [ v ] ) * y > 30 ,
2619
2648
direction : v
0 commit comments