-
Notifications
You must be signed in to change notification settings - Fork 12
[AF-247] Labels on default edges #376
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
apps/docs/src/components/angular/edges/labels/default-label/default-label.astro
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| import { DiagramComponent } from './diagram.component'; | ||
| --- | ||
|
|
||
| <DiagramComponent client:only="angular" /> |
54 changes: 54 additions & 0 deletions
54
apps/docs/src/components/angular/edges/labels/default-label/diagram.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // @collapse-start | ||
| import '@angular/compiler'; | ||
|
|
||
| import { Component } from '@angular/core'; | ||
| import { | ||
| initializeModel, | ||
| NgDiagramComponent, | ||
| provideNgDiagram, | ||
| } from 'ng-diagram'; | ||
|
|
||
| @Component({ | ||
| imports: [NgDiagramComponent], | ||
| providers: [provideNgDiagram()], | ||
| template: ` | ||
| <div class="not-content diagram"> | ||
| <ng-diagram [model]="model" /> | ||
| </div> | ||
| `, | ||
| styles: ` | ||
| .diagram { | ||
| display: flex; | ||
| height: 20rem; | ||
| } | ||
| `, | ||
| }) | ||
| // @collapse-end | ||
| export class DiagramComponent { | ||
| model = initializeModel({ | ||
| metadata: { | ||
| viewport: { x: 0, y: 0, scale: 0.88 }, | ||
| }, | ||
| nodes: [ | ||
| { | ||
| id: '1', | ||
| position: { x: 150, y: 150 }, | ||
| data: { label: 'Node 1' }, | ||
| rotatable: true, | ||
| }, | ||
| { id: '2', position: { x: 500, y: 150 }, data: { label: 'Node 2' } }, | ||
| ], | ||
| edges: [ | ||
| { | ||
| id: '1', | ||
| source: '1', | ||
| sourcePort: 'port-right', | ||
| targetPort: 'port-left', | ||
| target: '2', | ||
| // @mark-start | ||
| data: { label: 'Label' }, | ||
| // @mark-end | ||
| }, | ||
| ], | ||
| }); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
...iagram/src/lib/components/edge-label/default-edge-label/default-edge-label.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <div [class.selected]="selected()" [className]="'ng-diagram-default-edge-label'"> | ||
| <ng-content /> | ||
| </div> |
11 changes: 11 additions & 0 deletions
11
...iagram/src/lib/components/edge-label/default-edge-label/default-edge-label.component.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| .ng-diagram-default-edge-label { | ||
| display: flex; | ||
| padding: var(--edge-label-padding, 4px 8px); | ||
| border-radius: var(--edge-label-border-radius, 4px); | ||
| font-size: var(--edge-label-font-size, 12px); | ||
| background: var(--edge-label-background-color, var(--ngd-default-edge-label-background-color)); | ||
| color: var(--edge-label-text-color, var(--ngd-default-edge-label-color)); | ||
| border: var(--edge-label-border-width, 1px) solid | ||
| var(--edge-label-border-color, var(--ngd-default-edge-label-border-color)); | ||
| transition: var(--edge-label-border-transition, border-color 0.1s ease-in-out); | ||
| } | ||
14 changes: 14 additions & 0 deletions
14
...-diagram/src/lib/components/edge-label/default-edge-label/default-edge-label.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core'; | ||
| import { NgDiagramBaseEdgeComponent } from '../../../../public-api'; | ||
|
|
||
| @Component({ | ||
| selector: 'ng-diagram-default-edge-label', | ||
| standalone: true, | ||
| templateUrl: './default-edge-label.component.html', | ||
| styleUrl: './default-edge-label.component.scss', | ||
| changeDetection: ChangeDetectionStrategy.OnPush, | ||
| }) | ||
| export class DefaultEdgeLabelComponent { | ||
| private readonly edgeComponent = inject(NgDiagramBaseEdgeComponent); | ||
| readonly selected = computed(() => this.edgeComponent.selected()); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 8 additions & 1 deletion
9
...gram/projects/ng-diagram/src/lib/components/edge/default-edge/default-edge.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,8 @@ | ||
| <ng-diagram-base-edge class="default-edge" [edge]="edge()" /> | ||
| <ng-diagram-base-edge class="default-edge" [edge]="edge()"> | ||
| @let edgeLabel = label(); | ||
| @if (edgeLabel) { | ||
| <ng-diagram-base-edge-label class="ng-diagram-default-label" [id]="'edge-label'" [positionOnEdge]="0.5"> | ||
| <ng-diagram-default-edge-label>{{ edgeLabel }}</ng-diagram-default-edge-label> | ||
| </ng-diagram-base-edge-label> | ||
| } | ||
| </ng-diagram-base-edge> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...m/projects/ng-diagram/src/lib/components/edge/default-edge/default-edge.component.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 7 additions & 3 deletions
10
...iagram/projects/ng-diagram/src/lib/components/edge/default-edge/default-edge.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,19 @@ | ||
| import { ChangeDetectionStrategy, Component, input } from '@angular/core'; | ||
| import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core'; | ||
| import { Edge } from '../../../../core/src'; | ||
| import { NgDiagramEdgeTemplate } from '../../../types'; | ||
| import { NgDiagramBaseEdgeLabelComponent } from '../../edge-label/base-edge-label/base-edge-label.component'; | ||
| import { DefaultEdgeLabelComponent } from '../../edge-label/default-edge-label/default-edge-label.component'; | ||
| import { NgDiagramBaseEdgeComponent } from '../base-edge/base-edge.component'; | ||
|
|
||
| @Component({ | ||
| selector: 'ng-diagram-default-edge', | ||
| templateUrl: './default-edge.component.html', | ||
| styleUrls: ['./default-edge.component.scss'], | ||
| changeDetection: ChangeDetectionStrategy.OnPush, | ||
| imports: [NgDiagramBaseEdgeComponent], | ||
| imports: [NgDiagramBaseEdgeComponent, NgDiagramBaseEdgeLabelComponent, DefaultEdgeLabelComponent], | ||
| }) | ||
| export class NgDiagramDefaultEdgeComponent implements NgDiagramEdgeTemplate { | ||
| edge = input.required<Edge>(); | ||
| edge = input.required<Edge<{ label?: string }>>(); | ||
|
|
||
| label = computed(() => this.edge().data?.label); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.