diff --git a/projects/assets-library/assets/icons/copy-to-clipboard.svg b/projects/assets-library/assets/icons/copy-to-clipboard.svg deleted file mode 100644 index ecf9e4f01..000000000 --- a/projects/assets-library/assets/icons/copy-to-clipboard.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/projects/assets-library/src/icons/icon-library.module.ts b/projects/assets-library/src/icons/icon-library.module.ts index c04765bbb..77af2859f 100644 --- a/projects/assets-library/src/icons/icon-library.module.ts +++ b/projects/assets-library/src/icons/icon-library.module.ts @@ -37,7 +37,6 @@ const iconsRootPath = 'assets/icons'; { key: IconType.CollapseAll, url: `${iconsRootPath}/collapse-all.svg` }, { key: IconType.Collapsed, url: `${iconsRootPath}/plus-square.svg` }, { key: IconType.Compare, url: `${iconsRootPath}/compare.svg` }, - { key: IconType.CopyToClipboard, url: `${iconsRootPath}/copy-to-clipboard.svg` }, { key: IconType.Custom, url: `${iconsRootPath}/custom.svg` }, { key: IconType.Dashboard, url: `${iconsRootPath}/dashboard.svg` }, { key: IconType.Device, url: `${iconsRootPath}/device.svg` }, diff --git a/projects/assets-library/src/icons/icon-type.ts b/projects/assets-library/src/icons/icon-type.ts index 521dfe2b3..34df42d6c 100644 --- a/projects/assets-library/src/icons/icon-type.ts +++ b/projects/assets-library/src/icons/icon-type.ts @@ -29,7 +29,7 @@ export const enum IconType { Collapsed = 'svg:plus-square', Compare = 'svg:compare', CompareArrows = 'compare_arrows', - CopyToClipboard = 'svg:copy-to-clipboard', + ContentCopy = 'content_copy', Code = 'svg:code', Custom = 'svg:custom', CustomWebhook = 'svg:custom-webhook', diff --git a/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.test.ts b/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.test.ts index 184b85db4..a79399eb4 100644 --- a/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.test.ts +++ b/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.test.ts @@ -32,10 +32,11 @@ describe('Copy to Clipboard component', () => { test('correctly copies the text to clipboard', fakeAsync(() => { spectator = createHost( - ``, + ``, { hostProps: { - textToBeCopied: 'Text to be copied' + textToBeCopied: 'Text to be copied', + tooltipDuration: 1000 } } ); @@ -62,7 +63,7 @@ describe('Copy to Clipboard component', () => { spectator.tick(); expect(spectator.inject(PopoverService).drawPopover).toHaveBeenCalled(); - spectator.tick(4000); + spectator.tick(1001); expect(mockPopoverRef.close).toHaveBeenCalled(); })); }); diff --git a/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.ts b/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.ts index 23ac553b0..797372ae2 100644 --- a/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.ts +++ b/projects/components/src/copy-to-clipboard/copy-to-clipboard.component.ts @@ -52,7 +52,7 @@ export class CopyToClipboardComponent implements OnInit, OnDestroy { public size?: ButtonSize = ButtonSize.Small; @Input() - public icon?: IconType = IconType.CopyToClipboard; + public icon?: IconType = IconType.ContentCopy; @Input() public label?: string = 'Copy to Clipboard'; @@ -63,6 +63,9 @@ export class CopyToClipboardComponent implements OnInit, OnDestroy { @Input() public text?: string; + @Input() + public tooltipDuration: number = 3000; + @Output() public readonly copiedChanges: EventEmitter = new EventEmitter(); @@ -133,7 +136,7 @@ export class CopyToClipboardComponent implements OnInit, OnDestroy { }); return of(popoverRef).pipe( - delay(3000), + delay(this.tooltipDuration ?? 0), finalize(() => popoverRef.close()) ); }