Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve ESLint config + add job in CI #9

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
root = true

[*]
# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{js,ts}]
indent_style = space
indent_size = 2

[*.{css,scss}]
indent_style = space
indent_size = 2

[*.json]
indent_style = space
indent_size = 2
17 changes: 16 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,19 @@ jobs:

- name: Test PHPUnit
run: |
vendor/bin/phpunit
vendor/bin/phpunit
eslint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'yarn'
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Lint code
run: yarn lint --max-warnings 0
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"tabWidth": 2,
"singleQuote": true,
"trailingComma": "all",
"arrowParens": "avoid",
"printWidth": 120
}
19 changes: 15 additions & 4 deletions assets/dist/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,18 @@ class default_1 extends Controller {
window.addEventListener('modal:close', () => this.closeModal());
}
changeDisplayMode(event) {
document.querySelectorAll('.fm-c-toggle-buttons__action').forEach((button) => {
document.querySelectorAll('.fm-c-toggle-buttons__action').forEach(button => {
button.classList.remove('fm-c-toggle-buttons__action--active');
});
event.currentTarget.classList.add('fm-c-toggle-buttons__action--active');
const mode = event.params.mode;
this.cardTargets.forEach((card) => {
this.cardTargets.forEach(card => {
card.classList.toggle('display-grid', mode === 'grid');
});
this.listTarget.classList.toggle('fm-c-content__cards--grid', mode === 'grid');
}
openModal({ params }) {
openModal(event) {
const { params } = event;
if (params.value) {
this.modalOldValueTarget.value = params.value;
this.modalOldValueTarget.dispatchEvent(new Event('change', { bubbles: true }));
Expand Down Expand Up @@ -137,6 +138,16 @@ class default_1 extends Controller {
this.collapseMap.delete(element);
}
}
default_1.targets = ['list', 'card', 'dialog', 'modalAction', 'modalOldValue', 'select', 'dropdown', 'submenu', 'collapse'];
default_1.targets = [
'list',
'card',
'dialog',
'modalAction',
'modalOldValue',
'select',
'dropdown',
'submenu',
'collapse',
];

export { default_1 as default };
196 changes: 104 additions & 92 deletions assets/src/controller.ts
Original file line number Diff line number Diff line change
@@ -1,117 +1,129 @@
import './styles.scss';

import {ActionEvent, Controller} from "@hotwired/stimulus";
import {Toggle} from "./scripts/toggle";
import {Collapse} from "./scripts/collapse";
import { type ActionEvent, Controller } from '@hotwired/stimulus';
import { Toggle } from './scripts/toggle';
import { Collapse } from './scripts/collapse';

export default class extends Controller {
static targets = [ 'list', 'card', 'dialog', 'modalAction', 'modalOldValue', 'select', 'dropdown', 'submenu', 'collapse' ];

declare listTarget: HTMLElement;
declare cardTargets: HTMLElement[];
declare dialogTarget: HTMLDialogElement;
declare modalActionTarget: HTMLInputElement;
declare modalOldValueTarget: HTMLInputElement;

private toggleMap: Map<HTMLElement, Toggle> = new Map();
private collapseMap: Map<HTMLElement, Collapse> = new Map();

initialize() {
window.addEventListener('modal:close', () => this.closeModal());
static targets = [
'list',
'card',
'dialog',
'modalAction',
'modalOldValue',
'select',
'dropdown',
'submenu',
'collapse',
];

declare listTarget: HTMLElement;
declare cardTargets: HTMLElement[];
declare dialogTarget: HTMLDialogElement;
declare modalActionTarget: HTMLInputElement;
declare modalOldValueTarget: HTMLInputElement;

private toggleMap: Map<HTMLElement, Toggle> = new Map();
private collapseMap: Map<HTMLElement, Collapse> = new Map();

initialize() {
window.addEventListener('modal:close', () => this.closeModal());
}

changeDisplayMode(event: ActionEvent) {
document.querySelectorAll('.fm-c-toggle-buttons__action').forEach(button => {
button.classList.remove('fm-c-toggle-buttons__action--active');
});
(event.currentTarget as HTMLButtonElement).classList.add('fm-c-toggle-buttons__action--active');

const mode = event.params.mode;

this.cardTargets.forEach(card => {
card.classList.toggle('display-grid', mode === 'grid');
});
this.listTarget.classList.toggle('fm-c-content__cards--grid', mode === 'grid');
}

openModal(event: ActionEvent) {
const { params } = event;

if (params.value) {
this.modalOldValueTarget.value = params.value;
this.modalOldValueTarget.dispatchEvent(new Event('change', { bubbles: true }));
}

changeDisplayMode(event: ActionEvent) {
document.querySelectorAll('.fm-c-toggle-buttons__action').forEach((button) => {
button.classList.remove('fm-c-toggle-buttons__action--active')
});
(event.currentTarget as HTMLButtonElement).classList.add('fm-c-toggle-buttons__action--active');
this.modalActionTarget.value = params.action;
this.modalActionTarget.dispatchEvent(new Event('change', { bubbles: true }));

const mode = event.params.mode;

this.cardTargets.forEach((card) => {
card.classList.toggle('display-grid', mode === 'grid')
});
this.listTarget.classList.toggle('fm-c-content__cards--grid', mode === 'grid');
}

openModal({params}: {params: any}) {
if (params.value) {
this.modalOldValueTarget.value = params.value;
this.modalOldValueTarget.dispatchEvent(new Event('change', { bubbles: true }));
}

this.modalActionTarget.value = params.action;
this.modalActionTarget.dispatchEvent(new Event('change', { bubbles: true }));

this.dialogTarget.showModal();
this.dialogTarget.classList.add('fm-c-modal--open');
document.body.classList.add('fm-u-overflow-hidden');
}
this.dialogTarget.showModal();
this.dialogTarget.classList.add('fm-c-modal--open');
document.body.classList.add('fm-u-overflow-hidden');
}

closeModal() {
this.modalOldValueTarget.value = '';
this.modalOldValueTarget.dispatchEvent(new Event('change', { bubbles: true }));
this.modalActionTarget.value = '';
this.modalActionTarget.dispatchEvent(new Event('change', { bubbles: true }));
closeModal() {
this.modalOldValueTarget.value = '';
this.modalOldValueTarget.dispatchEvent(new Event('change', { bubbles: true }));
this.modalActionTarget.value = '';
this.modalActionTarget.dispatchEvent(new Event('change', { bubbles: true }));

this.dialogTarget.classList.remove('fm-c-modal--open');
this.dialogTarget.close();
document.body.classList.remove('fm-u-overflow-hidden');
}
this.dialogTarget.classList.remove('fm-c-modal--open');
this.dialogTarget.close();
document.body.classList.remove('fm-u-overflow-hidden');
}

selectTargetConnected(element: HTMLElement) {
const toggle = new Toggle(element, '.fm-c-custom-select__input-wrapper', '.fm-c-custom-select__list-wrapper');
toggle.connect();
selectTargetConnected(element: HTMLElement) {
const toggle = new Toggle(element, '.fm-c-custom-select__input-wrapper', '.fm-c-custom-select__list-wrapper');
toggle.connect();

this.toggleMap.set(element, toggle);
}
this.toggleMap.set(element, toggle);
}

selectTargetDisconnected(element: HTMLElement) {
const toggle = this.toggleMap.get(element) as Toggle;
toggle.disconnect()
selectTargetDisconnected(element: HTMLElement) {
const toggle = this.toggleMap.get(element) as Toggle;
toggle.disconnect();

this.toggleMap.delete(element);
}
this.toggleMap.delete(element);
}

dropdownTargetConnected(element: HTMLElement) {
const toggle = new Toggle(element, '.fm-c-card-actions__action', '.fm-c-card-actions__content');
toggle.connect();
dropdownTargetConnected(element: HTMLElement) {
const toggle = new Toggle(element, '.fm-c-card-actions__action', '.fm-c-card-actions__content');
toggle.connect();

this.toggleMap.set(element, toggle);
}
this.toggleMap.set(element, toggle);
}

dropdownTargetDisconnected(element: HTMLElement) {
const toggle = this.toggleMap.get(element) as Toggle;
toggle.disconnect()
dropdownTargetDisconnected(element: HTMLElement) {
const toggle = this.toggleMap.get(element) as Toggle;
toggle.disconnect();

this.toggleMap.delete(element);
}
this.toggleMap.delete(element);
}

submenuTargetConnected(element: HTMLElement) {
const toggle = new Toggle(element, '.fm-c-content__sticky-button', '.fm-c-submenu', '.fm-c-submenu__content');
toggle.connect();
submenuTargetConnected(element: HTMLElement) {
const toggle = new Toggle(element, '.fm-c-content__sticky-button', '.fm-c-submenu', '.fm-c-submenu__content');
toggle.connect();

this.toggleMap.set(element, toggle);
}
this.toggleMap.set(element, toggle);
}

submenuTargetDisconnected(element: HTMLElement) {
const toggle = this.toggleMap.get(element) as Toggle;
toggle.disconnect()
submenuTargetDisconnected(element: HTMLElement) {
const toggle = this.toggleMap.get(element) as Toggle;
toggle.disconnect();

this.toggleMap.delete(element);
}
this.toggleMap.delete(element);
}

collapseTargetConnected(element: HTMLElement) {
const collapse = new Collapse(element);
collapse.connect();
collapseTargetConnected(element: HTMLElement) {
const collapse = new Collapse(element);
collapse.connect();

this.collapseMap.set(element, collapse);
}
this.collapseMap.set(element, collapse);
}

collapseTargetDisconnected(element: HTMLElement) {
const collapse = this.collapseMap.get(element) as Collapse;
collapse.disconnect()
collapseTargetDisconnected(element: HTMLElement) {
const collapse = this.collapseMap.get(element) as Collapse;
collapse.disconnect();

this.collapseMap.delete(element);
}
}
this.collapseMap.delete(element);
}
}
52 changes: 26 additions & 26 deletions assets/src/scripts/collapse.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
export class Collapse {
element: HTMLElement;
trigger: HTMLElement;
wrapper?: HTMLElement;
content?: HTMLElement;
visible: boolean = false;
element: HTMLElement;
trigger: HTMLElement;
wrapper?: HTMLElement;
content?: HTMLElement;
visible: boolean = false;

constructor(element: HTMLElement) {
this.element = element;
this.trigger = element.querySelector('.fm-c-collapse__arrow') as HTMLElement;
this.wrapper = element.querySelector('.fm-c-collapse__wrapper') as HTMLElement;
this.content = element.querySelector('.fm-c-collapse__content') as HTMLElement;
this.visible = 'true' === element.dataset.visible;
}
constructor(element: HTMLElement) {
this.element = element;
this.trigger = element.querySelector('.fm-c-collapse__arrow') as HTMLElement;
this.wrapper = element.querySelector('.fm-c-collapse__wrapper') as HTMLElement;
this.content = element.querySelector('.fm-c-collapse__content') as HTMLElement;
this.visible = 'true' === element.dataset.visible;
}

connect() {
this.trigger.addEventListener('click', this.collapse.bind(this), true);
}
connect() {
this.trigger.addEventListener('click', this.collapse.bind(this), true);
}

disconnect() {
this.trigger.removeEventListener('click', this.collapse.bind(this), true);
}
disconnect() {
this.trigger.removeEventListener('click', this.collapse.bind(this), true);
}

collapse() {
if (null === this.wrapper || null === this.content) return;
collapse() {
if (null === this.wrapper || null === this.content) return;

this.visible = !this.visible;
this.visible = !this.visible;

this.element.classList.toggle('fm-c-collapse--visible', this.visible);
this.element.classList.toggle('fm-c-collapse--hidden', !this.visible);
this.element.dataset.visible = this.visible ? 'true' : 'false';
}
}
this.element.classList.toggle('fm-c-collapse--visible', this.visible);
this.element.classList.toggle('fm-c-collapse--hidden', !this.visible);
this.element.dataset.visible = this.visible ? 'true' : 'false';
}
}
Loading
Loading