@duetds/cli 4.0.50 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duetds/cli",
-  "version": "4.0.50",
+  "version": "4.1.0",
   "description": "This package includes Duet Design System CLI.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "LocalTapiola Services Ltd <duetdesignsystem@lahitapiola.fi>",
@@ -33,5 +33,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "641839a13806dcc24e3c98d5e7a3485c7f88b2d4"
+  "gitHead": "ec23a2c67483a350022a26c2d70b3503de94198b"
 }

package/templates/angular/16.2.0/package.file

@@ -54,6 +54,6 @@
     "eslint-plugin-unused-imports": "2.0.0",
     "jest": "^29.5.0",
     "ts-node": "10.9.0",
-    "typescript": "^5.1.0"
+    "typescript": "5.1.3"
   }
 }

package/templates/angular/17.0.0/package.file

@@ -54,6 +54,6 @@
     "eslint-plugin-unused-imports": "3.0.0",
     "jest": "^29.5.0",
     "ts-node": "10.9.0",
-    "typescript": "^5.2.2"
+    "typescript": "5.2.2"
   }
 }

package/templates/angular/17.0.0/src/app/app.module.ts

@@ -10,9 +10,18 @@ import { FooterComponent } from "./footer/footer.component"
 import { InvestmentAmountComponent } from './investment-amount/investment-amount.component';
 import { InvestmentOriginComponent } from './investment-origin/investment-origin.component';
 import { SummaryComponent } from './summary/summary.component'
+import {
+  BooleanValueAccessorDirective, NumericValueAccessorDirective,
+  SelectValueAccessorDirective, TextValueAccessorDirective
+} from "./value-accessors"
 
 @NgModule({
-  declarations: [AppComponent, IndexPageComponent, HeaderComponent, FooterComponent, InvestmentAmountComponent, InvestmentOriginComponent, SummaryComponent],
+  declarations: [
+    AppComponent, IndexPageComponent, HeaderComponent, FooterComponent,
+    InvestmentAmountComponent, InvestmentOriginComponent, SummaryComponent,
+    BooleanValueAccessorDirective, NumericValueAccessorDirective,
+    SelectValueAccessorDirective, TextValueAccessorDirective,
+  ],
   imports: [BrowserModule, FormsModule, ReactiveFormsModule, AppRoutingModule],
   providers: [],
   bootstrap: [AppComponent],

package/templates/angular/17.0.0/src/app/investment-amount/investment-amount.component.html

@@ -1,5 +1,6 @@
 <ng-container [formGroup]="form">
   <duet-select
+    formControlName="agreement"
     expand
     label="Valitse sopimus"
     placeholder="Valitse…"
@@ -74,6 +75,7 @@
   <duet-spacer></duet-spacer>
   <duet-card variation="plain" background="gray-lighter">
     <duet-input
+      formControlName="additionalInvestment"
       numeric-keyboard
       expand
       label="Syötä summa"

package/templates/angular/17.0.0/src/app/investment-amount/investment-amount.component.ts

@@ -12,19 +12,9 @@ export class InvestmentAmountComponent implements OnInit {
   @Input() agreements: Record<number, Agreement>
   @Input() form: FormGroup
 
-  constructor(public formatter: CurrencyFormatterService, private myElement: ElementRef) {}
+  constructor(public formatter: CurrencyFormatterService) {}
 
-  ngOnInit(): void {
-    const element = this.myElement.nativeElement as Element
-    const select = element.querySelector("duet-select") as HTMLDuetSelectElement
-    const input = element.querySelector("duet-input") as HTMLDuetInputElement
-    select.addEventListener("duetChange", (e: CustomEvent<{value: number}>) => {
-      this.form.controls['agreement'].setValue(e.detail.value)
-    })
-    input.addEventListener("duetChange", (e: CustomEvent<{value: string}>) => {
-      this.form.controls['additionalInvestment'].setValue(Number(e.detail.value))
-    })
-  }
+  ngOnInit(): void {}
 
   get selectedAgreement() {
     return this.agreements[this.form.value.agreement]

package/templates/angular/17.0.0/src/app/investment-origin/investment-origin.component.html

@@ -1,12 +1,12 @@
 <ng-container [formGroup]="form">
-  <duet-checkbox label="Valinta 1"></duet-checkbox>
-  <duet-checkbox label="Valinta 2"></duet-checkbox>
-  <duet-checkbox label="Valinta 3"></duet-checkbox>
-  <duet-checkbox label="Valinta 4"></duet-checkbox>
-  <duet-checkbox label="Valinta 5"></duet-checkbox>
-  <duet-checkbox label="Valinta 6"></duet-checkbox>
+  <duet-checkbox formControlName="salary" label="Valinta 1"></duet-checkbox>
+  <duet-checkbox formControlName="gift" label="Valinta 2"></duet-checkbox>
+  <duet-checkbox formControlName="heritage" label="Valinta 3"></duet-checkbox>
+  <duet-checkbox formControlName="entrepreneurialIncome" label="Valinta 4"></duet-checkbox>
+  <duet-checkbox formControlName="assets" label="Valinta 5"></duet-checkbox>
+  <duet-checkbox formControlName="otherIncome" label="Valinta 6"></duet-checkbox>
   <duet-checkbox label="Muu, mikä?" (duetChange)="handleExtrasChange($event)"></duet-checkbox>
   <div *ngIf="hasExtras">
-    <duet-input label="Kerro sijoitettavien varojen muu alkuperä" label-hidden (duetChange)="handleExtrasValueChange($event)"></duet-input>
+    <duet-input formControlName="extras" label="Kerro sijoitettavien varojen muu alkuperä" label-hidden></duet-input>
   </div>
-</ng-container>
+</ng-container>

package/templates/angular/17.0.0/src/app/investment-origin/investment-origin.component.ts

@@ -11,23 +11,9 @@ export class InvestmentOriginComponent implements OnInit {
   hasExtras = false
   extrasValue = ""
 
-  constructor(private myElement: ElementRef) {}
+  constructor() {}
 
-  ngOnInit(): void {
-    const element = this.myElement.nativeElement as Element
-    function listenCheckboxEvents(form: FormGroup, selector: string, control: string) {
-      const checkbox = element.querySelector(`duet-checkbox[label='${selector}']`) as HTMLDuetSelectElement
-      checkbox.addEventListener("duetChange", (e: CustomEvent<{checked: boolean}>) => {
-        form.controls[control].setValue(e.detail.checked)
-      })
-    }
-    listenCheckboxEvents(this.form, 'Valinta 1', 'salary')
-    listenCheckboxEvents(this.form, 'Valinta 2', 'gift')
-    listenCheckboxEvents(this.form, 'Valinta 3', 'heritage')
-    listenCheckboxEvents(this.form, 'Valinta 4', 'entrepreneurialIncome')
-    listenCheckboxEvents(this.form, 'Valinta 5', 'assets')
-    listenCheckboxEvents(this.form, 'Valinta 6', 'otherIncome')
-  }
+  ngOnInit(): void {}
 
   handleExtrasChange(event: CustomEvent) {
     this.hasExtras = event.detail.checked
@@ -36,9 +22,4 @@ export class InvestmentOriginComponent implements OnInit {
       this.form.get("extras").setValue(null)
     }
   }
-
-  handleExtrasValueChange(event: CustomEvent) {
-    this.extrasValue = event.detail.value
-    this.form.get("extras").setValue(this.extrasValue)
-  }
 }

package/templates/angular/17.0.0/src/app/value-accessors.ts

@@ -0,0 +1,147 @@
+/* eslint-disable @angular-eslint/directive-selector, @angular-eslint/no-host-metadata-property */
+
+import { Directive, ElementRef, HostListener } from "@angular/core";
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
+
+@Directive({})
+export class ValueAccessor implements ControlValueAccessor {
+  private onChange: (value: any) => void = () => {};
+  private onTouched: () => void = () => {};
+  protected lastValue: any;
+
+  constructor(protected el: ElementRef) {}
+
+  writeValue(value: any) {
+    this.el.nativeElement.value = this.lastValue = value == null ? '' : value;
+  }
+
+  handleChangeEvent(value: any) {
+    if (value !== this.lastValue) {
+      this.lastValue = value;
+      this.onChange(value);
+    }
+  }
+
+  @HostListener('focusout')
+  _handleBlurEvent() {
+    this.onTouched();
+  }
+
+  registerOnChange(fn: (value: any) => void) {
+    this.onChange = fn;
+  }
+  registerOnTouched(fn: () => void) {
+    this.onTouched = fn;
+  }
+
+  setDisabledState(disabled: boolean) {
+    this.el.nativeElement.disabled = disabled;
+  }
+}
+
+@Directive({
+  selector: 'duet-input:not([type=number]), duet-textarea, duet-date-picker',
+  host: {
+    '(duetChange)': 'handleChangeEvent($event.target.value)'
+  },
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: TextValueAccessorDirective,
+      multi: true
+    }
+  ]
+})
+export class TextValueAccessorDirective extends ValueAccessor {
+  constructor(el: ElementRef) {
+    super(el);
+  }
+}
+
+@Directive({
+  /* tslint:disable-next-line:directive-selector */
+  selector: 'duet-range-slider, duet-select, duet-radio-group, duet-choice-group',
+  host: {
+    '(duetChange)': 'handleChangeEvent($event.target.value)'
+  },
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: SelectValueAccessorDirective,
+      multi: true
+    }
+  ]
+})
+export class SelectValueAccessorDirective extends ValueAccessor {
+  constructor(el: ElementRef) {
+    super(el);
+  }
+}
+
+@Directive({
+  /* tslint:disable-next-line:directive-selector */
+  selector: 'duet-radio, duet-choice[type=radio]',
+  host: {
+    '(duetSelect)': 'handleChangeEvent($event.target.checked)'
+  },
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: RadioValueAccessorDirective,
+      multi: true
+    }
+  ]
+})
+export class RadioValueAccessorDirective extends ValueAccessor {
+  constructor(el: ElementRef) {
+    super(el);
+  }
+}
+
+@Directive({
+  /* tslint:disable-next-line:directive-selector */
+  selector: 'duet-input[type=number], duet-number-input',
+  host: {
+    '(duetChange)': 'handleChangeEvent($event.target.value)'
+  },
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: NumericValueAccessorDirective,
+      multi: true
+    }
+  ]
+})
+export class NumericValueAccessorDirective extends ValueAccessor {
+  constructor(el: ElementRef) {
+    super(el);
+  }
+  registerOnChange(fn: (_: number | null) => void) {
+    super.registerOnChange(value => {
+      fn(value === '' ? null : parseFloat(value));
+    });
+  }
+}
+
+@Directive({
+  /* tslint:disable-next-line:directive-selector */
+  selector: 'duet-checkbox, duet-toggle, duet-choice[type=checkbox]',
+  host: {
+    '(duetChange)': 'handleChangeEvent($event.target.checked)'
+  },
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: BooleanValueAccessorDirective,
+      multi: true
+    }
+  ]
+})
+export class BooleanValueAccessorDirective extends ValueAccessor {
+  constructor(el: ElementRef) {
+    super(el);
+  }
+  writeValue(value: any) {
+    this.el.nativeElement.checked = this.lastValue = value == null ? false : value;
+  }
+}

package/templates/react/16.14.0/package.file

@@ -18,7 +18,7 @@
     "@duetds/tokens": "latest",
     "react": "16.14.0",
     "react-dom": "16.14.0",
-    "react-scripts": "3.4.4",
+    "react-scripts": "5.0.0",
     "sass": "1.49.9"
   },
   "eslintConfig": {

package/templates/react/19rc/README.md

@@ -0,0 +1,54 @@
+# Duet React Example
+
+An example app built with [@duetds/react](https://www.npmjs.com/package/@duetds/react), demonstrating basic form handling.
+
+## Features
+
+- Comes with [Duet Web Components](https://www.duetds.com/components/).
+- Supports [Duet Design Tokens](https://www.duetds.com/tokens/) in SCSS without additional configuration.
+- Comes with automated build and deploy steps for prototyping.
+- Additionally comes with [Duet Fonts](https://www.duetds.com/typography/) and [Duet CSS Framework](https://www.duetds.com/css-framework/) preconfigured.
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.<br />
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.<br />
+You will also see any lint errors in the console.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.<br />
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br />
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://create-react-app.dev/docs/getting-started/).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+For more Duet usage instructions, please see [Duet Design System documentation](https://www.duetds.com).
+
+## Copyright
+
+Copyright © 2020 LocalTapiola Services Ltd. For license, please see LICENSE.md.