Merge pull request #621 from materializecss/refactor-components

Refactor components

Author: wuda-io

.all-contributorsrc

@@ -1,5 +1,5 @@
-@use './mixins.module.scss' as *;
-@use './variables' as *;
+@use '../../sass/mixins.module.scss' as *;
+@use '../../sass/variables' as *;
 
 :root {
   --btn-height: 40px;

.gitattributes

@@ -1,5 +1,5 @@
-import { Component, BaseOptions, InitElements, MElement, Openable } from "./component";
-import { Utils } from './utils';
+import { Component, BaseOptions, InitElements, MElement, Openable } from '../../src/component';
+import { Utils } from '../../src/utils';
 
 export interface FloatingActionButtonOptions extends BaseOptions {
   /**
@@ -65,14 +65,10 @@ export class FloatingActionButton
     this.el.classList.add(`direction-${this.options.direction}`);
     this._anchor.tabIndex = 0;
     this._menu.ariaExpanded = 'false';
-    if (this.options.direction === 'top')
-      this.offsetY = 40;
-    else if (this.options.direction === 'right')
-      this.offsetX = -40;
-    else if (this.options.direction === 'bottom')
-      this.offsetY = -40;
-    else
-      this.offsetX = 40;
+    if (this.options.direction === 'top') this.offsetY = 40;
+    else if (this.options.direction === 'right') this.offsetX = -40;
+    else if (this.options.direction === 'bottom') this.offsetY = -40;
+    else this.offsetX = 40;
     this._setupEventHandlers();
   }
 
@@ -140,14 +136,14 @@ export class FloatingActionButton
   }
 
   _handleFABClick = () => {
-    this._handleFABToggle()
-}
+    this._handleFABToggle();
+  };
 
   _handleFABKeyPress = (e) => {
-    if(Utils.keys.ENTER.includes(e.key)) {
+    if (Utils.keys.ENTER.includes(e.key)) {
       this._handleFABToggle();
     }
-  }
+  };
 
   _handleFABToggle = () => {
     if (this.isOpen) {

README.md

@@ -1,5 +1,5 @@
-@use './variables' as *;
-@use './mixins.module.scss' as *;
+@use '../../sass/variables' as *;
+@use '../../sass/mixins.module.scss' as *;
 
 .card-panel {
   transition: box-shadow .25s;

sass/components/_badges.scss renamed to components/badges/_badges.scss

@@ -1,5 +1,5 @@
-import { Utils } from './utils';
-import { Component, BaseOptions, InitElements, MElement, Openable } from './component';
+import { Utils } from '../../src/utils';
+import { Component, BaseOptions, InitElements, MElement, Openable } from '../../src/component';
 
 export interface CardsOptions extends BaseOptions {
   onOpen: (el: Element) => void;
@@ -182,7 +182,7 @@ export class Cards extends Component<CardsOptions> implements Openable {
       document.addEventListener('DOMContentLoaded', () => {
         const cards = document.querySelectorAll('.card');
         cards.forEach((el) => {
-          if (el && (el['M_Card'] == undefined)) this.init((el as HTMLElement));
+          if (el && el['M_Card'] == undefined) this.init(el as HTMLElement);
         });
       });
   }