@nativescript/core 8.5.1-rc.2 → 8.5.1-rc.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/index.d.ts +2 -1
  2. package/index.js +2 -1
  3. package/index.js.map +1 -1
  4. package/package.json +1 -1
  5. package/ui/builder/component-builder/index.js +1 -1
  6. package/ui/builder/component-builder/index.js.map +1 -1
  7. package/ui/builder/index.js +1 -1
  8. package/ui/builder/index.js.map +1 -1
  9. package/ui/core/view/view-common.js +1 -1
  10. package/ui/core/view/view-common.js.map +1 -1
  11. package/ui/editable-text-base/editable-text-base-common.d.ts +1 -0
  12. package/ui/editable-text-base/editable-text-base-common.js.map +1 -1
  13. package/ui/editable-text-base/index.android.js +4 -0
  14. package/ui/editable-text-base/index.android.js.map +1 -1
  15. package/ui/editable-text-base/index.d.ts +7 -1
  16. package/ui/frame/fragment.transitions.android.js +4 -7
  17. package/ui/frame/fragment.transitions.android.js.map +1 -1
  18. package/ui/frame/frame-common.js +1 -1
  19. package/ui/frame/frame-common.js.map +1 -1
  20. package/ui/frame/index.ios.js +2 -3
  21. package/ui/frame/index.ios.js.map +1 -1
  22. package/ui/index.d.ts +1 -1
  23. package/ui/index.js +1 -1
  24. package/ui/index.js.map +1 -1
  25. package/ui/styling/style-scope.js +1 -1
  26. package/ui/styling/style-scope.js.map +1 -1
  27. package/ui/text-field/index.ios.js +24 -9
  28. package/ui/text-field/index.ios.js.map +1 -1
  29. package/ui/transition/fade-transition.ios.js +2 -2
  30. package/ui/transition/fade-transition.ios.js.map +1 -1
  31. package/ui/transition/index.ios.js +2 -1
  32. package/ui/transition/index.ios.js.map +1 -1
  33. package/ui/transition/modal-transition.ios.js +3 -2
  34. package/ui/transition/modal-transition.ios.js.map +1 -1
  35. package/ui/transition/page-transition.ios.d.ts +1 -0
  36. package/ui/transition/page-transition.ios.js +29 -11
  37. package/ui/transition/page-transition.ios.js.map +1 -1
  38. package/ui/transition/shared-transition-helper.ios.js +43 -60
  39. package/ui/transition/shared-transition-helper.ios.js.map +1 -1
  40. package/ui/transition/shared-transition.d.ts +29 -15
  41. package/ui/transition/shared-transition.js +28 -13
  42. package/ui/transition/shared-transition.js.map +1 -1
  43. package/ui/transition/slide-transition.ios.js +2 -2
  44. package/ui/transition/slide-transition.ios.js.map +1 -1
  45. package/utils/common.d.ts +33 -0
  46. package/utils/common.js +70 -1
  47. package/utils/common.js.map +1 -1
  48. package/utils/native-helper.ios.js +4 -23
  49. package/utils/native-helper.ios.js.map +1 -1
  50. package/ui/builder/module-name-sanitizer.d.ts +0 -6
  51. package/ui/builder/module-name-sanitizer.js +0 -24
  52. package/ui/builder/module-name-sanitizer.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { getPageStartDefaultsForType, getRectFromProps, getSpringFromProps, SharedTransition, SharedTransitionAnimationType } from './shared-transition';
2
2
  import { isNumber } from '../../utils/types';
3
3
  import { Screen } from '../../platform';
4
+ import { CORE_ANIMATION_DEFAULTS } from '../../utils/common';
4
5
  import { iOSNativeHelper } from '../../utils/native-helper';
5
6
  export class SharedTransitionHelper {
6
7
  static animate(state, transitionContext, type) {
@@ -12,13 +13,10 @@ export class SharedTransitionHelper {
12
13
  switch (state.activeType) {
13
14
  case SharedTransitionAnimationType.present: {
14
15
  // console.log('-- Transition present --');
15
- SharedTransition.events().notify({
16
- eventName: SharedTransition.startedEvent,
17
- data: {
18
- id: transition.id,
19
- type,
20
- action: 'present',
21
- },
16
+ SharedTransition.notifyEvent(SharedTransition.startedEvent, {
17
+ id: transition.id,
18
+ type,
19
+ action: 'present',
22
20
  });
23
21
  if (type === 'modal') {
24
22
  transitionContext.containerView.addSubview(transition.presented.view);
@@ -220,13 +218,10 @@ export class SharedTransitionHelper {
220
218
  transition.presenting.view.removeFromSuperview();
221
219
  }
222
220
  transitionContext.completeTransition(true);
223
- SharedTransition.events().notify({
224
- eventName: SharedTransition.finishedEvent,
225
- data: {
226
- id: transition?.id,
227
- type,
228
- action: 'present',
229
- },
221
+ SharedTransition.notifyEvent(SharedTransition.finishedEvent, {
222
+ id: transition.id,
223
+ type,
224
+ action: 'present',
230
225
  });
231
226
  };
232
227
  const animateProperties = () => {
@@ -300,13 +295,10 @@ export class SharedTransitionHelper {
300
295
  }
301
296
  case SharedTransitionAnimationType.dismiss: {
302
297
  // console.log('-- Transition dismiss --');
303
- SharedTransition.events().notify({
304
- eventName: SharedTransition.startedEvent,
305
- data: {
306
- id: transition?.id,
307
- type,
308
- action: 'dismiss',
309
- },
298
+ SharedTransition.notifyEvent(SharedTransition.startedEvent, {
299
+ id: transition.id,
300
+ type,
301
+ action: 'dismiss',
310
302
  });
311
303
  if (type === 'page') {
312
304
  transitionContext.containerView.insertSubviewBelowSubview(transition.presenting.view, transition.presented.view);
@@ -319,6 +311,7 @@ export class SharedTransitionHelper {
319
311
  }
320
312
  const pageEnd = state.pageEnd;
321
313
  const pageEndTags = pageEnd?.sharedTransitionTags || {};
314
+ const pageReturn = state.pageReturn;
322
315
  for (const p of transition.sharedElements.presented) {
323
316
  p.view.opacity = 0;
324
317
  }
@@ -343,9 +336,11 @@ export class SharedTransitionHelper {
343
336
  // now that all the callbacks had their chance to run, we can take the snapshots
344
337
  for (const data of snapshotData) {
345
338
  const view = data.view.ios;
346
- // we need to reset the alpha to the start value so the view is visible in the snapshot
347
339
  const currentAlpha = view.alpha;
348
- view.alpha = data.startOpacity;
340
+ if (pageReturn?.useStartOpacity) {
341
+ // when desired, reset the alpha to the start value so the view is visible in the snapshot
342
+ view.alpha = data.startOpacity;
343
+ }
349
344
  // take a new snapshot
350
345
  data.snapshot.image = iOSNativeHelper.snapshotView(view, Screen.mainScreen.scale);
351
346
  // find the currently visible view with the same sharedTransitionTag
@@ -361,7 +356,6 @@ export class SharedTransitionHelper {
361
356
  // add snapshot to animate
362
357
  transitionContext.containerView.addSubview(data.snapshot);
363
358
  }
364
- const pageReturn = state.pageReturn;
365
359
  const cleanupDismiss = () => {
366
360
  for (const presenting of transition.sharedElements.presenting) {
367
361
  presenting.view.opacity = presenting.startOpacity;
@@ -374,13 +368,10 @@ export class SharedTransitionHelper {
374
368
  SharedTransition.finishState(transition.id);
375
369
  transition.sharedElements = null;
376
370
  transitionContext.completeTransition(true);
377
- SharedTransition.events().notify({
378
- eventName: SharedTransition.finishedEvent,
379
- data: {
380
- id: transition?.id,
381
- type,
382
- action: 'dismiss',
383
- },
371
+ SharedTransition.notifyEvent(SharedTransition.finishedEvent, {
372
+ id: transition.id,
373
+ type,
374
+ action: 'dismiss',
384
375
  });
385
376
  };
386
377
  const animateProperties = () => {
@@ -436,13 +427,10 @@ export class SharedTransitionHelper {
436
427
  });
437
428
  }
438
429
  static interactiveStart(state, interactiveState, type) {
439
- SharedTransition.events().notify({
440
- eventName: SharedTransition.startedEvent,
441
- data: {
442
- id: state?.instance?.id,
443
- type,
444
- action: 'interactiveStart',
445
- },
430
+ SharedTransition.notifyEvent(SharedTransition.startedEvent, {
431
+ id: state.instance.id,
432
+ type,
433
+ action: 'interactiveStart',
446
434
  });
447
435
  switch (type) {
448
436
  case 'page':
@@ -473,19 +461,16 @@ export class SharedTransitionHelper {
473
461
  });
474
462
  }
475
463
  interactiveState.propertyAnimator.fractionComplete = percent;
476
- SharedTransition.events().notify({
477
- eventName: SharedTransition.interactiveUpdateEvent,
478
- data: {
479
- id: state?.instance?.id,
480
- type,
481
- percent,
482
- },
464
+ SharedTransition.notifyEvent(SharedTransition.interactiveUpdateEvent, {
465
+ id: state?.instance?.id,
466
+ type,
467
+ percent,
483
468
  });
484
469
  }
485
470
  static interactiveCancel(state, interactiveState, type) {
486
471
  if (state?.instance && interactiveState?.added && interactiveState?.propertyAnimator) {
487
472
  interactiveState.propertyAnimator.reversed = true;
488
- const duration = isNumber(state.pageEnd?.duration) ? state.pageEnd?.duration / 1000 : 0.35;
473
+ const duration = isNumber(state.pageEnd?.duration) ? state.pageEnd?.duration / 1000 : CORE_ANIMATION_DEFAULTS.duration;
489
474
  interactiveState.propertyAnimator.continueAnimationWithTimingParametersDurationFactor(null, duration);
490
475
  setTimeout(() => {
491
476
  for (const p of state.instance.sharedElements.presented) {
@@ -499,12 +484,13 @@ export class SharedTransitionHelper {
499
484
  interactiveState.added = false;
500
485
  interactiveState.transitionContext.cancelInteractiveTransition();
501
486
  interactiveState.transitionContext.completeTransition(false);
502
- SharedTransition.events().notify({
503
- eventName: SharedTransition.interactiveCancelledEvent,
504
- data: {
505
- id: state?.instance?.id,
506
- type,
507
- },
487
+ SharedTransition.updateState(state?.instance?.id, {
488
+ interactiveBegan: false,
489
+ interactiveCancelled: true,
490
+ });
491
+ SharedTransition.notifyEvent(SharedTransition.interactiveCancelledEvent, {
492
+ id: state?.instance?.id,
493
+ type,
508
494
  });
509
495
  }, duration * 1000);
510
496
  }
@@ -512,7 +498,7 @@ export class SharedTransitionHelper {
512
498
  static interactiveFinish(state, interactiveState, type) {
513
499
  if (state?.instance && interactiveState?.added && interactiveState?.propertyAnimator) {
514
500
  interactiveState.propertyAnimator.reversed = false;
515
- const duration = isNumber(state.pageReturn?.duration) ? state.pageReturn?.duration / 1000 : 0.35;
501
+ const duration = isNumber(state.pageReturn?.duration) ? state.pageReturn?.duration / 1000 : CORE_ANIMATION_DEFAULTS.duration;
516
502
  interactiveState.propertyAnimator.continueAnimationWithTimingParametersDurationFactor(null, duration);
517
503
  setTimeout(() => {
518
504
  for (const presenting of state.instance.sharedElements.presenting) {
@@ -524,13 +510,10 @@ export class SharedTransitionHelper {
524
510
  interactiveState.added = false;
525
511
  interactiveState.transitionContext.finishInteractiveTransition();
526
512
  interactiveState.transitionContext.completeTransition(true);
527
- SharedTransition.events().notify({
528
- eventName: SharedTransition.finishedEvent,
529
- data: {
530
- id: state?.instance?.id,
531
- type,
532
- action: 'interactiveFinish',
533
- },
513
+ SharedTransition.notifyEvent(SharedTransition.finishedEvent, {
514
+ id: state?.instance?.id,
515
+ type,
516
+ action: 'interactiveFinish',
534
517
  });
535
518
  }, duration * 1000);
536
519
  }
@@ -1 +1 @@
1
- {"version":3,"file":"shared-transition-helper.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition-helper.ios.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared-transition-helper.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition-helper.ios.ts"],"names":[],"mappings":"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"}
@@ -3,27 +3,20 @@ import { Observable } from '../../data/observable';
3
3
  import { ViewBase } from '../core/view-base';
4
4
  import type { View } from '../core/view';
5
5
  import type { PanGestureEventData } from '../gestures';
6
- export declare const DEFAULT_DURATION = 0.35;
7
- export declare const DEFAULT_SPRING: {
8
- tension: number;
9
- friction: number;
10
- mass: number;
11
- velocity: number;
12
- delay: number;
13
- };
14
6
  export declare enum SharedTransitionAnimationType {
15
7
  present = 0,
16
8
  dismiss = 1
17
9
  }
18
10
  type SharedTransitionEventAction = 'present' | 'dismiss' | 'interactiveStart' | 'interactiveFinish';
11
+ export type SharedTransitionEventDataPayload = {
12
+ id: number;
13
+ type: TransitionNavigationType;
14
+ action?: SharedTransitionEventAction;
15
+ percent?: number;
16
+ };
19
17
  export type SharedTransitionEventData = {
20
18
  eventName: string;
21
- data: {
22
- id: number;
23
- type: TransitionNavigationType;
24
- action?: SharedTransitionEventAction;
25
- percent?: number;
26
- };
19
+ data: SharedTransitionEventDataPayload;
27
20
  };
28
21
  export type SharedRect = {
29
22
  x?: number;
@@ -127,7 +120,14 @@ export interface SharedTransitionConfig {
127
120
  /**
128
121
  * View settings to return to the original page with.
129
122
  */
130
- pageReturn?: SharedTransitionPageWithDurationProperties;
123
+ pageReturn?: SharedTransitionPageWithDurationProperties & {
124
+ /**
125
+ * In some cases you may want the returning animation to start with the original opacity,
126
+ * instead of beginning where it ended up on pageEnd.
127
+ * Note: you can try enabling this property in cases where your return animation doesn't appear correct.
128
+ */
129
+ useStartOpacity?: boolean;
130
+ };
131
131
  }
132
132
  export interface SharedTransitionState extends SharedTransitionConfig {
133
133
  /**
@@ -167,6 +167,12 @@ export declare class SharedTransition {
167
167
  static custom(transition: Transition, options?: SharedTransitionConfig): {
168
168
  instance: Transition;
169
169
  };
170
+ /**
171
+ * Whether a transition is in progress or not.
172
+ * Note: used internally however exposed in case custom state ordering is needed.
173
+ * Updated when transitions start/end/cancel.
174
+ */
175
+ static inProgress: boolean;
170
176
  /**
171
177
  * Listen to various shared element transition events.
172
178
  * @returns Observable
@@ -188,6 +194,14 @@ export declare class SharedTransition {
188
194
  * When the interactive transition updates with the percent value.
189
195
  */
190
196
  static interactiveUpdateEvent: string;
197
+ /**
198
+ * Notify a Shared Transition event.
199
+ * @param id transition instance id
200
+ * @param eventName Shared Transition event name
201
+ * @param type TransitionNavigationType
202
+ * @param action SharedTransitionEventAction
203
+ */
204
+ static notifyEvent(eventName: string, data: SharedTransitionEventDataPayload): void;
191
205
  /**
192
206
  * Enable to see various console logging output of Shared Element Transition behavior.
193
207
  */
@@ -1,15 +1,8 @@
1
1
  import { Observable } from '../../data/observable';
2
2
  import { Screen } from '../../platform';
3
3
  import { isNumber } from '../../utils/types';
4
+ import { CORE_ANIMATION_DEFAULTS } from '../../utils/common';
4
5
  import { querySelectorAll } from '../core/view-base';
5
- export const DEFAULT_DURATION = 0.35;
6
- export const DEFAULT_SPRING = {
7
- tension: 140,
8
- friction: 10,
9
- mass: 1,
10
- velocity: 0,
11
- delay: 0,
12
- };
13
6
  // always increment when adding new transitions to be able to track their state
14
7
  export var SharedTransitionAnimationType;
15
8
  (function (SharedTransitionAnimationType) {
@@ -60,6 +53,28 @@ export class SharedTransition {
60
53
  }
61
54
  return sharedTransitionEvents;
62
55
  }
56
+ /**
57
+ * Notify a Shared Transition event.
58
+ * @param id transition instance id
59
+ * @param eventName Shared Transition event name
60
+ * @param type TransitionNavigationType
61
+ * @param action SharedTransitionEventAction
62
+ */
63
+ static notifyEvent(eventName, data) {
64
+ switch (eventName) {
65
+ case SharedTransition.startedEvent:
66
+ case SharedTransition.interactiveUpdateEvent:
67
+ SharedTransition.inProgress = true;
68
+ break;
69
+ default:
70
+ SharedTransition.inProgress = false;
71
+ break;
72
+ }
73
+ SharedTransition.events().notify({
74
+ eventName,
75
+ data,
76
+ });
77
+ }
63
78
  /**
64
79
  * Update transition state.
65
80
  * @param id Transition instance id
@@ -171,11 +186,11 @@ export function getRectFromProps(props, defaults) {
171
186
  */
172
187
  export function getSpringFromProps(props) {
173
188
  return {
174
- tension: isNumber(props?.tension) ? props?.tension : DEFAULT_SPRING.tension,
175
- friction: isNumber(props?.friction) ? props?.friction : DEFAULT_SPRING.friction,
176
- mass: isNumber(props?.mass) ? props?.mass : DEFAULT_SPRING.mass,
177
- velocity: isNumber(props?.velocity) ? props?.velocity : DEFAULT_SPRING.velocity,
178
- delay: isNumber(props?.delay) ? props?.delay : DEFAULT_SPRING.delay,
189
+ tension: isNumber(props?.tension) ? props?.tension : CORE_ANIMATION_DEFAULTS.spring.tension,
190
+ friction: isNumber(props?.friction) ? props?.friction : CORE_ANIMATION_DEFAULTS.spring.friction,
191
+ mass: isNumber(props?.mass) ? props?.mass : CORE_ANIMATION_DEFAULTS.spring.mass,
192
+ velocity: isNumber(props?.velocity) ? props?.velocity : CORE_ANIMATION_DEFAULTS.spring.velocity,
193
+ delay: isNumber(props?.delay) ? props?.delay : 0,
179
194
  };
180
195
  }
181
196
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"shared-transition.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared-transition.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { Transition } from '.';
2
2
  import { Screen } from '../../platform';
3
- import { DEFAULT_DURATION } from './shared-transition';
3
+ import { CORE_ANIMATION_DEFAULTS } from '../../utils/common';
4
4
  export class SlideTransition extends Transition {
5
5
  constructor(direction, duration, curve) {
6
6
  super(duration, curve);
@@ -30,7 +30,7 @@ var SlideTransitionController = /** @class */ (function (_super) {
30
30
  if (owner) {
31
31
  return owner.getDuration();
32
32
  }
33
- return DEFAULT_DURATION;
33
+ return CORE_ANIMATION_DEFAULTS.duration;
34
34
  };
35
35
  SlideTransitionController.prototype.animateTransition = function (transitionContext) {
36
36
  // console.log('SlideTransitionController animateTransition');
@@ -1 +1 @@
1
- {"version":3,"file":"slide-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/slide-transition.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAO9C,YAAY,SAAiB,EAAE,QAAgB,EAAE,KAAU;QAC1D,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,sBAAsB,CAAC,oBAA4C,EAAE,SAAiB,EAAE,MAAwB,EAAE,IAAsB;QACvI,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,yCAAyC;QACzC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;CACD"}
1
+ {"version":3,"file":"slide-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/slide-transition.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAO9C,YAAY,SAAiB,EAAE,QAAgB,EAAE,KAAU;QAC1D,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,sBAAsB,CAAC,oBAA4C,EAAE,SAAiB,EAAE,MAAwB,EAAE,IAAsB;QACvI,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,yCAAyC;QACzC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;CACD"}
package/utils/common.d.ts CHANGED
@@ -5,6 +5,12 @@ export declare const FILE_PREFIX = "file:///";
5
5
  export declare function escapeRegexSymbols(source: string): string;
6
6
  export declare function convertString(value: any): any;
7
7
  export declare function getModuleName(path: string): string;
8
+ /**
9
+ * Helps sanitize a module name if it is prefixed with '~/', '~' or '/'
10
+ * @param moduleName the name
11
+ * @param removeExtension whether to remove extension
12
+ */
13
+ export declare function sanitizeModuleName(moduleName: string, removeExtension?: boolean): string;
8
14
  export declare function isFileOrResourcePath(path: string): boolean;
9
15
  export declare function isFontIconURI(uri: string): boolean;
10
16
  export declare function isDataURI(uri: string): boolean;
@@ -25,3 +31,30 @@ export declare function debounce(fn: any, delay?: number): (...args: Array<any>)
25
31
  export declare function throttle(fn: Function, delay?: number): (...args: any[]) => void;
26
32
  export declare function queueGC(delay?: number, useThrottle?: boolean): void;
27
33
  export declare function isEmoji(value: string): boolean;
34
+ /**
35
+ * Default animation values used throughout core
36
+ */
37
+ export declare const CORE_ANIMATION_DEFAULTS: {
38
+ duration: number;
39
+ spring: {
40
+ tension: number;
41
+ friction: number;
42
+ mass: number;
43
+ velocity: number;
44
+ };
45
+ };
46
+ /**
47
+ * Get a duration with damping value from various spring related settings.
48
+ * Helpful when needing to convert spring settings to isolated duration value.
49
+ * @param springSettings various spring settings
50
+ * @returns calculated duration with damping from spring settings
51
+ */
52
+ export declare function getDurationWithDampingFromSpring(springSettings?: {
53
+ tension?: number;
54
+ friction?: number;
55
+ mass?: number;
56
+ velocity?: number;
57
+ }): {
58
+ duration: number;
59
+ damping: number;
60
+ };
package/utils/common.js CHANGED
@@ -1,6 +1,5 @@
1
1
  import * as types from './types';
2
2
  import { dispatchToMainThread, dispatchToUIThread, isMainThread } from './mainthread-helper';
3
- import { sanitizeModuleName } from '../ui/builder/module-name-sanitizer';
4
3
  import emojiRegex from 'emoji-regex';
5
4
  import { GC } from './index';
6
5
  export * from './mainthread-helper';
@@ -35,6 +34,29 @@ export function getModuleName(path) {
35
34
  const moduleName = path.replace('./', '');
36
35
  return sanitizeModuleName(moduleName);
37
36
  }
37
+ /**
38
+ * Helps sanitize a module name if it is prefixed with '~/', '~' or '/'
39
+ * @param moduleName the name
40
+ * @param removeExtension whether to remove extension
41
+ */
42
+ export function sanitizeModuleName(moduleName, removeExtension = true) {
43
+ moduleName = moduleName.trim();
44
+ if (moduleName.startsWith('~/')) {
45
+ moduleName = moduleName.substring(2);
46
+ }
47
+ else if (moduleName.startsWith('~')) {
48
+ moduleName = moduleName.substring(1);
49
+ }
50
+ else if (moduleName.startsWith('/')) {
51
+ moduleName = moduleName.substring(1);
52
+ }
53
+ if (removeExtension) {
54
+ const extToRemove = ['js', 'ts', 'xml', 'html', 'css', 'scss'];
55
+ const extensionRegEx = new RegExp(`(.*)\\.(?:${extToRemove.join('|')})`, 'i');
56
+ moduleName = moduleName.replace(extensionRegEx, '$1');
57
+ }
58
+ return moduleName;
59
+ }
38
60
  export function isFileOrResourcePath(path) {
39
61
  if (!types.isString(path)) {
40
62
  return false;
@@ -171,4 +193,51 @@ export function isEmoji(value) {
171
193
  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Unicode_Property_Escapes
172
194
  return emojiRegex().test(value);
173
195
  }
196
+ /**
197
+ * Default animation values used throughout core
198
+ */
199
+ export const CORE_ANIMATION_DEFAULTS = {
200
+ duration: 0.35,
201
+ spring: {
202
+ tension: 140,
203
+ friction: 10,
204
+ mass: 1,
205
+ velocity: 0,
206
+ },
207
+ };
208
+ /**
209
+ * Get a duration with damping value from various spring related settings.
210
+ * Helpful when needing to convert spring settings to isolated duration value.
211
+ * @param springSettings various spring settings
212
+ * @returns calculated duration with damping from spring settings
213
+ */
214
+ export function getDurationWithDampingFromSpring(springSettings) {
215
+ // for convenience, default spring settings are provided
216
+ const opt = {
217
+ ...CORE_ANIMATION_DEFAULTS.spring,
218
+ ...(springSettings || {}),
219
+ };
220
+ const damping = opt.friction / Math.sqrt(2 * opt.tension);
221
+ const undampedFrequency = Math.sqrt(opt.tension / opt.mass);
222
+ // console.log({
223
+ // damping,
224
+ // undampedFrequency
225
+ // })
226
+ const epsilon = 0.001;
227
+ let duration = 0;
228
+ if (damping < 1) {
229
+ // console.log('damping < 1');
230
+ const a = Math.sqrt(1 - Math.pow(damping, 2));
231
+ const b = opt.velocity / (a * undampedFrequency);
232
+ const c = damping / a;
233
+ const d = -((b - c) / epsilon);
234
+ if (d > 0) {
235
+ duration = Math.log(d) / (damping * undampedFrequency);
236
+ }
237
+ }
238
+ return {
239
+ duration,
240
+ damping,
241
+ };
242
+ }
174
243
  //# sourceMappingURL=common.js.map