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

explorer: Remove HTML button instances and use the new Button component #1714

Merged
merged 1 commit into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 0 additions & 1 deletion explorer/src/lib/components/__tests__/ListItem.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { cleanup, render } from "@testing-library/svelte";
import { ListItem } from "../";

const baseProps = {
tooltipId: "tooltipId",
tooltipText: "Tooltip text",
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@ exports[`Block Details > renders the Block Details component 1`] = `
</h3>

<button
class="dusk-button dusk-button--type--button dusk-button--variant--secondary dusk-button--size--normal"
type="button"
>
Back
<span
class="dusk-button__text"
>
Back
</span>
</button>
<!--&lt;Button&gt;-->
</header>

<dl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,24 @@ exports[`Navbar > renders the Navbar component 1`] = `
<button
aria-controls="dusk-navbar-menu"
aria-expanded="false"
class="dusk-navbar__toggle"
class="dusk-button dusk-button--type--button dusk-button--variant--primary dusk-button--size--normal dusk-icon-button dusk-navbar__toggle"
type="button"
>
<svg
aria-hidden="true"
class="dusk-navbar__toggle-svg"
viewBox="0 0 41 14"
xmlns="http://www.w3.org/2000/svg"
class="dusk-icon dusk-icon--size--large dusk-button__icon"
role="graphics-symbol"
viewBox="0 0 24 24"
>
<line
stroke-width="2"
x2="40.8"
y1="1"
y2="1"
/>
<line
stroke-width="2"
x2="40.8"
y1="12.9854"
y2="12.9854"
<path
d="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z"
/>
</svg>

<!--&lt;Icon&gt;-->


</button>
<!--&lt;Button&gt;-->

<div
class="dusk-navbar__menu dusk-navbar__menu--hidden"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,16 @@ exports[`Transaction Details > renders the Transaction Details component 1`] = `
</h3>

<button
class="dusk-button dusk-button--type--button dusk-button--variant--secondary dusk-button--size--normal"
type="button"
>
Back
<span
class="dusk-button__text"
>
Back
</span>
</button>
<!--&lt;Button&gt;-->
</header>

<dl
Expand Down
4 changes: 2 additions & 2 deletions explorer/src/lib/components/block-details/BlockDetails.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<script>
import { mdiArrowLeft, mdiArrowRight } from "@mdi/js";
import { AppAnchor, ListItem } from "$lib/components";
import { Card, Icon, ProgressBar } from "$lib/dusk/components";
import { Button, Card, Icon, ProgressBar } from "$lib/dusk/components";
import { createValueFormatter } from "$lib/dusk/value";
import { luxToDusk } from "$lib/dusk/currency";
import {
Expand Down Expand Up @@ -45,7 +45,7 @@
- #{formatter(34526)}</span
>
</h3>
<button type="button" on:click={() => history.back()}>Back</button>
<Button on:click={() => history.back()} text="Back" variant="secondary" />
</header>
<dl class="block-details__list" bind:this={blockList}>
<!-- BLOCK HASH -->
Expand Down
6 changes: 0 additions & 6 deletions explorer/src/lib/components/navbar/Navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@
outline: none;
}

.dusk-navbar__toggle-svg {
width: 1.875rem;
height: 1.875rem;
stroke: currentColor;
}

.dusk-navbar__menu {
display: flex;
flex-direction: column;
Expand Down
51 changes: 8 additions & 43 deletions explorer/src/lib/components/navbar/Navbar.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<script>
import { mdiClose, mdiMenu } from "@mdi/js";
import { AppAnchor, AppImage, SearchNotification } from "$lib/components";
import { SearchField } from "$lib/containers";
import { NavList, Select } from "$lib/dusk/components";
import { Button, NavList, Select } from "$lib/dusk/components";
import { createEventDispatcher, tick } from "svelte";
import "./Navbar.css";

Expand Down Expand Up @@ -72,52 +73,16 @@
sizes="(max-width: 1024px) 86px, 129px"
/>
</AppAnchor>

<button
<Button
aria-controls="dusk-navbar-menu"
aria-expanded={!hidden}
className="dusk-navbar__toggle"
icon={{ path: hidden ? mdiMenu : mdiClose, size: "large" }}
on:click={() => {
hidden = !hidden;
dispatch("toggleMenu", hidden);
}}
type="button"
class="dusk-navbar__toggle"
aria-controls="dusk-navbar-menu"
aria-expanded={!hidden}
>
{#if hidden}
<svg
class="dusk-navbar__toggle-svg"
aria-hidden="true"
viewBox="0 0 41 14"
xmlns="http://www.w3.org/2000/svg"
>
<line y1="1" x2="40.8" y2="1" stroke-width="2"></line>
<line y1="12.9854" x2="40.8" y2="12.9854" stroke-width="2"></line>
</svg>
{:else}
<svg
class="dusk-navbar__toggle-svg"
aria-hidden="true"
viewBox="0 0 32 31"
xmlns="http://www.w3.org/2000/svg"
>
<line
x1="1.29289"
y1="30.2929"
x2="30.1428"
y2="1.44294"
stroke-width="2"
></line>
<line
x1="1.70711"
y1="1.29289"
x2="30.5571"
y2="30.1428"
stroke-width="2"
></line>
</svg>
{/if}
</button>

/>
<div
class="dusk-navbar__menu"
class:dusk-navbar__menu--hidden={hidden}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<script>
import { ListItem } from "$lib/components";
import { Badge, Card, Switch } from "$lib/dusk/components";
import { Badge, Button, Card, Switch } from "$lib/dusk/components";
import { createValueFormatter } from "$lib/dusk/value";
import {
createCurrencyFormatter,
Expand Down Expand Up @@ -49,7 +49,7 @@
<Card className="transaction-details">
<header slot="header" class="transaction-details__header">
<h3 class="transaction-details__header-heading">Transaction Details</h3>
<button type="button" on:click={() => history.back()}>Back</button>
<Button on:click={() => history.back()} text="Back" variant="secondary" />
</header>
<dl class="transaction-details__list" bind:this={transactionList}>
<!-- TRANSACTION ID -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ exports[`Block > should render the Block Details page 1`] = `
</h3>

<button
class="dusk-button dusk-button--type--button dusk-button--variant--secondary dusk-button--size--normal"
type="button"
>
Back
<span
class="dusk-button__text"
>
Back
</span>
</button>
<!--&lt;Button&gt;-->
</header>

<dl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@ exports[`Transaction > should render the Transaction page 1`] = `
</h3>

<button
class="dusk-button dusk-button--type--button dusk-button--variant--secondary dusk-button--size--normal"
type="button"
>
Back
<span
class="dusk-button__text"
>
Back
</span>
</button>
<!--&lt;Button&gt;-->
</header>

<dl
Expand Down
Loading