Skip to content
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

Make snippet buttons invisible rather than hidden to prevent issues #479

Merged
merged 4 commits into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/gorgeous-taxis-join.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lblod/ember-rdfa-editor-lblod-plugins': patch
---

Fix bug where snippet hover buttons were not always functional on Chrome
89 changes: 54 additions & 35 deletions addon/components/snippet-plugin/nodes/snippet.gts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ import { on } from '@ember/modifier';
import SearchModal from '../search-modal';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { TemplateOnlyComponent } from '@ember/component/template-only';
import t from 'ember-intl/helpers/t';
import AuIcon from '@appuniversum/ember-appuniversum/components/au-icon';
import { not } from 'ember-truth-helpers';
import AuIcon, {
type AuIconSignature,
} from '@appuniversum/ember-appuniversum/components/au-icon';
import { SynchronizeIcon } from '@appuniversum/ember-appuniversum/components/icons/synchronize';
import { BinIcon } from '@appuniversum/ember-appuniversum/components/icons/bin';
import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
Expand All @@ -23,6 +27,33 @@ import {
import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
import { createAndInsertSnippet } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/nodes/snippet';

interface ButtonSig {
Args: {
isActive: boolean;
onClick: () => void;
icon: AuIconSignature['Args']['icon'];
helpText: string;
};
Element: HTMLButtonElement;
}

const SnippetButton: TemplateOnlyComponent<ButtonSig> = <template>
<button
class='say-snippet-button {{if @isActive "" "say-snippet-hidden"}}'
disabled={{(not @isActive)}}
type='button'
{{on 'click' @onClick}}
...attributes
>
{{#if @isActive}}
<AuIcon @icon={{@icon}} @size='large' {{on 'click' @onClick}} />
<div class='say-snippet-button-text'>
{{t @helpText}}
</div>
{{/if}}
</button>
</template>;

interface Signature {
Args: EmberNodeArgs;
Blocks: {
Expand Down Expand Up @@ -130,44 +161,32 @@ export default class SnippetNode extends Component<Signature> {
);
this.closeModal();
}

<template>
<div class='say-snippet-card'>
<div class='say-snippet-title'>{{this.node.attrs.title}}</div>
<div class='say-snippet-content'>{{yield}}</div>
{{#if this.isActive}}
<div class='say-snippet-icons'>
<button
class='say-snippet-button'
type='button'
{{on 'click' this.editFragment}}
>
<AuIcon @icon={{SynchronizeIcon}} @size='large' />
<div class='say-snippet-button-text'>
{{t 'snippet-plugin.snippet-node.change-fragment'}}
</div>
</button>
<button
class='say-snippet-button say-snippet-remove-button'
type='button'
{{on 'click' this.deleteFragment}}
>
<AuIcon @icon={{BinIcon}} />
<div class='say-snippet-button-text'>
{{t 'snippet-plugin.snippet-node.remove-fragment'}}
</div>
</button>
<button
class='say-snippet-button'
type='button'
{{on 'click' this.addFragment}}
>
<AuIcon @icon={{AddIcon}} />
<div class='say-snippet-button-text'>
{{t 'snippet-plugin.snippet-node.add-fragment'}}
</div>
</button>
</div>
{{/if}}
<div class='say-snippet-icons'>
<SnippetButton
@icon={{SynchronizeIcon}}
@helpText='snippet-plugin.snippet-node.change-fragment'
@onClick={{this.editFragment}}
@isActive={{this.isActive}}
/>
<SnippetButton
@icon={{BinIcon}}
@helpText='snippet-plugin.snippet-node.remove-fragment'
@onClick={{this.deleteFragment}}
@isActive={{this.isActive}}
class='say-snippet-remove-button'
/>
<SnippetButton
@icon={{AddIcon}}
@helpText='snippet-plugin.snippet-node.add-fragment'
@onClick={{this.addFragment}}
@isActive={{this.isActive}}
/>
</div>

</div>
<SearchModal
Expand Down
5 changes: 5 additions & 0 deletions app/styles/snippet-plugin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ div[typeof='besluitpublicatie:Documentonderdeel']
border-radius: 4px;
color: var(--au-blue-700);
cursor: pointer;
&.say-snippet-hidden {
color: transparent;
border: none;
cursor: auto;
}
&.say-snippet-remove-button {
color: var(--au-red-600);
border-color: var(--au-red-600);
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/controllers/regulatory-statement-sample.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ export default class RegulatoryStatementSampleController extends Controller {
rdfaAware: true,
},
snippet: {
endpoint: 'https://dev.reglementairebijlagen.lblod.info/sparql',
endpoint: 'https://dev.reglementairebijlagen.lblod.info/raw-sparql',
},
worship: {
endpoint: 'https://data.lblod.info/sparql',
Expand Down