Skip to content

Commit 6ea0544

Browse files
committed
refactor: edit icon
1 parent a09d352 commit 6ea0544

6 files changed

Lines changed: 6 additions & 17 deletions

File tree

source/js/steps/StepUIManager.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
class StepUIManager implements StepUIManagerInterface {
22
private visibilityHiddenClass: string = 'u-visibility--hidden';
3-
private editIconName: string = 'edit';
4-
private closeIconName: string = 'close';
5-
private iconAttribute: string = 'data-material-symbol';
63
private nextButtonLabelElement: HTMLElement|null;
74
private maxSteps: number;
85

@@ -24,8 +21,8 @@ class StepUIManager implements StepUIManagerInterface {
2421
}
2522

2623
this.prevButton.classList.toggle(this.visibilityHiddenClass, activeStep === 0);
27-
this.steps[activeStep].getEditButtonIcon().setAttribute(this.iconAttribute, this.closeIconName);
28-
this.steps[previousActiveStep].getEditButtonIcon().setAttribute(this.iconAttribute, this.editIconName);
24+
this.steps[previousActiveStep].getEditButton().classList.remove(this.visibilityHiddenClass);
25+
this.steps[activeStep].getEditButton().classList.add(this.visibilityHiddenClass);
2926
}
3027
}
3128

source/js/steps/helper/getSteps.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ export function getSteps(container: HTMLElement): StepsObject {
66
const step = stepContainer.querySelector('[data-js-frontend-form-step]');
77
const id = step?.getAttribute('data-js-frontend-form-step');
88
const editButton = stepContainer.querySelector('[data-js-frontend-form-step-edit]');
9-
const editButtonIcon = editButton?.querySelector('.c-icon');
109

11-
if (!id || !editButton || !editButtonIcon) {
10+
if (!id || !editButton) {
1211
console.error("Missing data-js-frontend-form-step attribute");
1312
return;
1413
}
1514

1615
const stepId = parseInt(id);
1716
steps[stepId] = StepFactory.createStep(
1817
editButton as HTMLElement,
19-
editButtonIcon as HTMLElement,
2018
step as HTMLElement,
2119
stepId
2220
);

source/js/steps/step.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ class Step implements StepInterface {
22

33
constructor(
44
private editButton: HTMLElement,
5-
private editButtonIcon: HTMLElement,
65
private stepContainer: HTMLElement,
76
public animateStepHelperInstance: AnimateStepHelperInterface,
87
private id: number
@@ -29,10 +28,6 @@ class Step implements StepInterface {
2928
return this.editButton;
3029
}
3130

32-
public getEditButtonIcon(): HTMLElement {
33-
return this.editButtonIcon;
34-
}
35-
3631
public getId(): number {
3732
return this.id;
3833
}

source/js/steps/stepFactory.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import AnimateStepHelper from './animation/animateStepHelper';
22
import Step from './step';
33

44
class StepFactory {
5-
public static createStep(editButton: HTMLElement, editButtonIcon: HTMLElement, step: HTMLElement, id: number): Step {
5+
public static createStep(editButton: HTMLElement, step: HTMLElement, id: number): Step {
66
return new Step(
77
editButton,
8-
editButtonIcon,
98
step,
109
new AnimateStepHelper(step),
1110
id

source/js/steps/stepInterface.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ interface StepInterface {
55
onEdit(callback: () => void): void;
66
getStepContainer(): HTMLElement;
77
getEditButton(): HTMLElement;
8-
getEditButtonIcon(): HTMLElement;
98
}
109

1110
interface SubmitInterface {

source/php/Module/views/step.blade.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727
@endif
2828
@endelement
2929
@button([
30-
'icon' => $index === 0 ? 'close' : 'edit',
30+
'icon' => 'edit',
3131
'size' => 'md',
3232
'style' => 'basic',
3333
'classList' => [
3434
'mod-frontend-form__step-header-edit',
35+
$index === 0 ? 'u-visibility--hidden' : ''
3536
],
3637
'attributeList' => [
3738
'role' => 'button',

0 commit comments

Comments
 (0)