Skip to content

Commit 324823b

Browse files
committed
style: rename 'triggerBtn' to 'trigger'
1 parent 8b4ff9a commit 324823b

File tree

3 files changed

+28
-33
lines changed

3 files changed

+28
-33
lines changed

js-css-animations/animate.js

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,16 @@ const updateCssProperties = (element, opts) => {
137137
* @returns The CSS selector for the animation target(s) or an empty string
138138
*/
139139
const getTargetSelector = eventTarget => {
140-
/** @type {HTMLElement|null} triggerBtn */
141-
let triggerBtn = eventTarget;
142-
while (triggerBtn && !triggerBtn.getAttribute('target-selector')) {
140+
/** @type {HTMLElement|null} trigger */
141+
let trigger = eventTarget;
142+
while (trigger && !trigger.getAttribute('target-selector')) {
143143
/** bubbles up untill the attribute is found */
144-
triggerBtn = triggerBtn.parentElement;
144+
trigger = trigger.parentElement;
145145
}
146146

147-
if (!triggerBtn)
148-
throw new ReferenceError('target-selector attribute not found');
147+
if (!trigger) throw new ReferenceError('target-selector attribute not found');
149148

150-
return triggerBtn.getAttribute('target-selector') ?? '';
149+
return trigger.getAttribute('target-selector') ?? '';
151150
};
152151

153152
/**
@@ -316,7 +315,7 @@ const animate = (element, action, id, opts = {}) => {
316315
disable(element);
317316
const {
318317
animType,
319-
triggerBtn,
318+
trigger,
320319
start,
321320
complete,
322321
keepSpace,
@@ -334,7 +333,7 @@ const animate = (element, action, id, opts = {}) => {
334333
});
335334
let parentMeasures, dimension, currentTransition;
336335

337-
if (triggerBtn) TARGETS_STACK.add(element, triggerBtn);
336+
if (trigger) TARGETS_STACK.add(element, trigger);
338337

339338
const handleAnimation = {
340339
begining: {
@@ -388,21 +387,21 @@ const animate = (element, action, id, opts = {}) => {
388387
},
389388
},
390389
conclude: () => {
391-
if (triggerBtn && opts.queryIndex === opts.totalTargets - 1) {
390+
if (trigger && opts.queryIndex === opts.totalTargets - 1) {
392391
opts.staggerDelay
393-
? CALLBACK_TRACKER.remove(triggerBtn)
394-
: setTimeout(() => CALLBACK_TRACKER.remove(triggerBtn), delay);
395-
TARGETS_STACK.get(triggerBtn).forEach(el => enable(el));
396-
TARGETS_STACK.remove(triggerBtn);
397-
} else if (!triggerBtn) {
392+
? CALLBACK_TRACKER.remove(trigger)
393+
: setTimeout(() => CALLBACK_TRACKER.remove(trigger), delay);
394+
TARGETS_STACK.get(trigger).forEach(el => enable(el));
395+
TARGETS_STACK.remove(trigger);
396+
} else if (!trigger) {
398397
enable(element);
399398
}
400399
},
401400
};
402401

403402
handleAnimation.begining[animType]();
404403
if (typeof start === 'function') {
405-
initCallback(triggerBtn, start, 'start');
404+
initCallback(trigger, start, 'start');
406405
}
407406
element.classList.add(CLASS_NAMES[action][id]);
408407
element.classList.remove(CLASS_NAMES[OPPOSITE_ACTION[action]][id]);
@@ -411,7 +410,7 @@ const animate = (element, action, id, opts = {}) => {
411410
setTimeout(() => {
412411
handleAnimation.end[animType]();
413412
if (typeof complete === 'function') {
414-
initCallback(triggerBtn, complete, 'complete');
413+
initCallback(trigger, complete, 'complete');
415414
}
416415
handleAnimation.conclude();
417416
}, duration + delay);
@@ -502,13 +501,9 @@ const eventHandler = (el, animationId, opts) => {
502501
* @see {@link module:globals.MOTION_ANIMS_ID}
503502
*/
504503
const init = (animationId, opts = {}, eventType = 'click') => {
505-
const {
506-
triggerBtn = `.${CLASS_NAMES.triggerBtn}`,
507-
targetSelector,
508-
cursor,
509-
} = opts;
504+
const { trigger = `.${CLASS_NAMES.trigger}`, targetSelector, cursor } = opts;
510505

511-
document.querySelectorAll(triggerBtn).forEach(btn => {
506+
document.querySelectorAll(trigger).forEach(btn => {
512507
btn.classList.add(CLASS_NAMES.btnCursor);
513508
if (typeof cursor === 'string') {
514509
setCssProperty(btn, 'cursor', cursor);

js-css-animations/globals.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const PROPERTY_NAMES = Object.freeze({
7070
* dimensionsTransitions: string,
7171
* heightTransition: string,
7272
* widthTransition: string,
73-
* triggerBtn: string,
73+
* trigger: string,
7474
* btnCursor: string,
7575
* collapsed: string,
7676
* hidden: string,
@@ -86,7 +86,7 @@ export const CLASS_NAMES = Object.freeze({
8686
dimensionsTransitions: 'js-anim--dimensions-transitions',
8787
heightTransition: 'js-anim--height-transition',
8888
widthTransition: 'js-anim--width-transition',
89-
triggerBtn: 'js-anim--trigger-btn',
89+
trigger: 'js-anim--trigger-btn',
9090
btnCursor: 'js-anim--btn-cursor',
9191
collapsed: 'js-anim--collapsed',
9292
hidden: 'js-anim--hidden',

main.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import jsCssAnimations from './js-css-animations/js-css-animations.js';
22

33
jsCssAnimations.init.slideUp({
4-
triggerBtn: '.btn--slide-up',
4+
trigger: '.btn--slide-up',
55
staggerDelay: 500,
66
duration: '1s',
77
start: () => {
@@ -10,14 +10,14 @@ jsCssAnimations.init.slideUp({
1010
});
1111

1212
jsCssAnimations.init.slideRight({
13-
triggerBtn: '.btn--slide-right',
13+
trigger: '.btn--slide-right',
1414
start: () => {
1515
jsCssAnimations.toggle('#anchor2 img', 'rotateRight', 'rotateUp');
1616
},
1717
});
1818

1919
jsCssAnimations.init.slideDown({
20-
triggerBtn: '.btn--slide-down',
20+
trigger: '.btn--slide-down',
2121
delay: '1.5s',
2222
start: () => {
2323
jsCssAnimations.toggle('img', 'rotateDownCCW', 'rotateUp', {
@@ -41,7 +41,7 @@ jsCssAnimations.init.slideDown({
4141
});
4242

4343
jsCssAnimations.init.slideLeft({
44-
triggerBtn: '.btn--slide-left',
44+
trigger: '.btn--slide-left',
4545
staggerDelay: 500,
4646
start: () => {
4747
jsCssAnimations.toggle('img', 'slideLeft', 'slideLeft', {
@@ -53,19 +53,19 @@ jsCssAnimations.init.slideLeft({
5353
});
5454

5555
jsCssAnimations.init.collapse({
56-
triggerBtn: '.collapse-expand--btn',
56+
trigger: '.collapse-expand--btn',
5757
targetSelector: '.collapse-expand--p',
5858
});
5959

6060
jsCssAnimations.init.collapse({
61-
triggerBtn: '.collapse-expand--btn__mult',
61+
trigger: '.collapse-expand--btn__mult',
6262
targetSelector: '.collapse-expand--p__mult',
6363
staggerDelay: 400,
6464
keepSpace: true,
6565
});
6666

6767
jsCssAnimations.init.fade({
68-
triggerBtn: '.fade--btn',
68+
trigger: '.fade--btn',
6969
blur: '2px',
7070
keepSpace: true,
7171
});
@@ -90,7 +90,7 @@ const validateInput = input => {
9090
};
9191

9292
jsCssAnimations.init.rotate({
93-
triggerBtn: '#rotation-angle',
93+
trigger: '#rotation-angle',
9494
targetSelector: '.rotation-area',
9595
eventType: 'change',
9696
// @ts-ignore

0 commit comments

Comments
 (0)