Skip to content

#1518 Fix hidden elements truncated by SVG filter #1519

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.

Sign up for GitHub

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

Open
15915996690 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#1518 Fix hidden elements truncated by SVG filter #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions src/components/svg-layer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('SvgLayer', () => {
expect(container.querySelector('path')?.getAttribute('stroke')).toBe('grey');
});

it('keeps invisible lines rendered and marks their wrapper with the hidden filter', () => {
it('keeps invisible lines rendered and marks their wrapper with the hidden style', () => {
const elements: Element[] = [
{
id: 'line_hidden',
Expand Down Expand Up @@ -98,8 +98,7 @@ describe('SvgLayer', () => {
expect(group).toBeInTheDocument();
expect(group).toHaveClass('removeMe');
expect(group).not.toHaveClass('rmp-hidden-pattern');
expect(group).not.toHaveAttribute('opacity');
expect(group).toHaveAttribute('filter', 'url(#invisible)');
expect(group).toHaveStyle({ filter: 'grayscale(100%)', opacity: 0.5 });
expect(group?.querySelector('path')).toBeInTheDocument();
expect(container.querySelector('path[stroke="url(#opaque)"]')).not.toBeInTheDocument();
expect(container.querySelector('[id="line_hidden_hidden_mask"]')).not.toBeInTheDocument();
Expand Down Expand Up @@ -140,7 +139,7 @@ describe('SvgLayer', () => {
expect(group).not.toHaveAttribute('filter');
});

it('does not apply selected glow to hidden wrappers because both states use filters', () => {
it('does not apply selected glow to hidden wrappers', () => {
const elements: Element[] = [
{
id: 'line_hidden',
Expand Down Expand Up @@ -168,10 +167,10 @@ describe('SvgLayer', () => {

const group = container.querySelector('#line_hidden');
expect(group).not.toHaveClass('rmp-selected-glow');
expect(group).toHaveAttribute('filter', 'url(#invisible)');
expect(group).toHaveStyle({ filter: 'grayscale(100%)', opacity: 0.5 });
});

it('marks invisible node wrappers with the hidden filter', () => {
it('marks invisible node wrappers with the hidden style', () => {
const elements: Element[] = [
{
id: 'misc_node_hidden',
Expand Down Expand Up @@ -204,14 +203,14 @@ describe('SvgLayer', () => {
const group = container.querySelector('#misc_node_hidden');
expect(group).toHaveClass('removeMe');
expect(group).not.toHaveClass('rmp-hidden-pattern');
expect(group).toHaveAttribute('filter', 'url(#invisible)');
expect(group).toHaveStyle({ filter: 'grayscale(100%)', opacity: 0.5 });
expect(container.querySelector('rect[width="80"][height="80"][fill="url(#opaque)"]')).not.toBeInTheDocument();
expect(container.querySelector('circle[fill="url(#opaque)"]')).not.toBeInTheDocument();
expect(container.querySelector('[id="misc_node_hidden_hidden_mask"]')).not.toBeInTheDocument();
expect(container.querySelector('[id="misc_node_hidden_hidden_pattern"]')).not.toBeInTheDocument();
});

it('marks invisible station wrappers with the hidden filter', () => {
it('marks invisible station wrappers with the hidden style', () => {
const elements: Element[] = [
{
id: 'stn_hidden',
Expand Down Expand Up @@ -239,7 +238,7 @@ describe('SvgLayer', () => {

const group = container.querySelector('#stn_hidden');
expect(group).toHaveClass('removeMe');
expect(group).toHaveAttribute('filter', 'url(#invisible)');
expect(group).toHaveStyle({ filter: 'grayscale(100%)', opacity: 0.5 });
});

it('treats legacy stations and misc nodes without visible as visible', () => {
Expand Down
6 changes: 3 additions & 3 deletions src/components/svg-layer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const SvgLayer = React.memo(
const visible = element.line!.attr.visible ?? true;
const wrapperProps = {
className: visible ? (isSelected ? 'rmp-selected-glow' : undefined) : 'removeMe',
filter: visible ? undefined : 'url(#invisible)',
style: visible ? undefined : { filter: 'grayscale(100%)', opacity: 0.5 },
};
const styleAttrs = element.line!.attr[style] as NonNullable<
ExternalLineStyleAttributes[keyof ExternalLineStyleAttributes]
Expand Down Expand Up @@ -121,7 +121,7 @@ const SvgLayer = React.memo(
const visible = attr.visible ?? true;
const wrapperProps = {
className: visible ? (isSelected ? 'rmp-selected-glow' : undefined) : 'removeMe',
filter: visible ? undefined : 'url(#invisible)',
style: visible ? undefined : { filter: 'grayscale(100%)', opacity: 0.5 },
};

const PreStationComponent = allStations[type]?.preComponent;
Expand Down Expand Up @@ -189,7 +189,7 @@ const SvgLayer = React.memo(
const visible = attr.visible ?? true;
const wrapperProps = {
className: visible ? (isSelected ? 'rmp-selected-glow' : undefined) : 'removeMe',
filter: visible ? undefined : 'url(#invisible)',
style: visible ? undefined : { filter: 'grayscale(100%)', opacity: 0.5 },
};

const PreMiscNodeComponent = miscNodes[type]?.preComponent;
Expand Down
8 changes: 0 additions & 8 deletions src/components/svg-wrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,14 +467,6 @@ const SvgWrapper = () => {
<rect x="0" y="0" width="2.5" height="2.5" fill="black" fillOpacity="50%" />
<rect x="2.5" y="2.5" width="2.5" height="2.5" fill="black" fillOpacity="50%" />
</pattern>
<filter id="invisible" colorInterpolationFilters="sRGB">
<feColorMatrix type="saturate" values="0" />
<feComponentTransfer>
<feFuncR type="table" tableValues="0.42 0.84" />
<feFuncG type="table" tableValues="0.45 0.86" />
<feFuncB type="table" tableValues="0.54 0.92" />
</feComponentTransfer>
</filter>
</defs>

<g
Expand Down