Merge pull request #139 from Rikarin/develop

Release
Rikarin · Jun 6, 2024 · e46e086 · e46e086
2 parents 602f79b + af9faec
commit e46e086
Show file tree

Hide file tree

Showing 21 changed files with 327 additions and 157 deletions.
diff --git a/apps/web/src/app/docs/components/example/example.html b/apps/web/src/app/docs/components/example/example.html
@@ -14,7 +14,7 @@
   </xui-tab-group>
 
   <div *ngIf="files || todo" class="menu">
-    <div *ngIf="todo" class="todo">TODO</div>
+    <div *ngIf="todo()" class="todo">TODO</div>
     @if (files) {
       <xui-icon (click)="openProject()" xuiTooltip="Edit in StackBlitz" icon="open_in_new"></xui-icon>
     }

diff --git a/apps/web/src/app/docs/components/example/example.ts b/apps/web/src/app/docs/components/example/example.ts
@@ -1,5 +1,5 @@
-import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
-import { InputBoolean, XuiCard, XuiCardModule, XuiIcon, XuiTabModule, XuiTooltipModule } from '@xui/components';
+import { ChangeDetectionStrategy, Component, Inject, input, Input, OnInit } from '@angular/core';
+import { convertToBoolean, XuiCardModule, XuiIcon, XuiTabModule, XuiTooltipModule } from '@xui/components';
 import sdk, { Project, ProjectFiles } from '@stackblitz/sdk';
 import { HttpClient } from '@angular/common/http';
 import { BehaviorSubject, lastValueFrom } from 'rxjs';
@@ -32,7 +32,7 @@ export class Example implements OnInit {
   content$ = new BehaviorSubject<File[]>([]);
 
   @Input() files: { [name: string]: FileType } = {};
-  @Input() @InputBoolean() todo = false;
+  todo = input(false, { transform: (v: string | boolean) => convertToBoolean(v) });
 
   get project(): Project {
     return <Project>{

diff --git a/apps/web/src/app/docs/components/theming/theming.component.html b/apps/web/src/app/docs/components/theming/theming.component.html
@@ -3,7 +3,7 @@ <h4>Theming</h4>
 <pre>Components can be themed by setting SCSS variables similar to Material Design</pre>
 
 <pre>
-  <code [highlight]="code" language="scss"></code>
+  <code lineNumbers="true" [highlight]="code" language="scss"></code>
 </pre>
 
 <app-example>

diff --git a/apps/web/src/app/docs/components/theming/theming.component.ts b/apps/web/src/app/docs/components/theming/theming.component.ts
@@ -3,10 +3,11 @@ import { STYLE_SCSS } from '../../../../templates/angular';
 import { HighlightModule } from 'ngx-highlightjs';
 import { Example } from '../example';
 import { XuiTooltipModule } from '@xui/components';
+import { HighlightLineNumbers } from 'ngx-highlightjs/line-numbers';
 
 @Component({
   standalone: true,
-  imports: [HighlightModule, Example, XuiTooltipModule],
+  imports: [HighlightModule, HighlightLineNumbers, Example, XuiTooltipModule],
   selector: 'app-theming',
   templateUrl: './theming.component.html',
   styleUrls: ['./theming.component.scss']