From 65f0e150fafd1b17a6cf89523aa3516ca15c6758 Mon Sep 17 00:00:00 2001
From: Georgii Lobko <globko@amazon.de>
Date: Tue, 24 Mar 2026 14:42:33 +0100
Subject: [PATCH 1/2] feat: Clickable token

---
 pages/token/clickable.page.tsx | 166 +++++++++++++++++++++++++++++++++
 src/token/interfaces.ts        |   2 +
 src/token/internal.tsx         |   2 +
 src/token/styles.scss          |   4 +
 4 files changed, 174 insertions(+)
 create mode 100644 pages/token/clickable.page.tsx

diff --git a/pages/token/clickable.page.tsx b/pages/token/clickable.page.tsx
new file mode 100644
index 0000000000..626447e5dd
--- /dev/null
+++ b/pages/token/clickable.page.tsx
@@ -0,0 +1,166 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import React from 'react';
+
+import AppLayoutToolbar from '~components/app-layout-toolbar';
+import Box from '~components/box';
+import BreadcrumbGroup from '~components/breadcrumb-group';
+import Button from '~components/button';
+import Container from '~components/container';
+import Header from '~components/header';
+import Popover from '~components/popover';
+import SpaceBetween from '~components/space-between';
+import Token from '~components/token';
+interface FieldValue {
+  value: string;
+}
+interface FieldPopoverProps {
+  fieldName: string;
+  fieldValues: FieldValue[];
+  onAddValue: (value: string) => void;
+  onAggregation: (aggregationType: string) => void;
+}
+function AggregationButtons({ onAggregation }: { onAggregation: (type: string) => void }) {
+  return (
+    <SpaceBetween size="xs">
+      <SpaceBetween direction="horizontal" size="xs">
+        <Button iconAlign="left" iconName="insert-row" variant="normal" onClick={() => onAggregation('sum')}>
+          Sum by
+        </Button>
+        <Button iconAlign="left" iconName="insert-row" variant="normal" onClick={() => onAggregation('count')}>
+          Count by
+        </Button>
+      </SpaceBetween>
+      <SpaceBetween direction="horizontal" size="xs">
+        <Button iconAlign="left" iconName="insert-row" variant="normal" onClick={() => onAggregation('avg')}>
+          Avg by
+        </Button>
+        <Button iconAlign="left" iconName="insert-row" variant="normal" onClick={() => onAggregation('max')}>
+          Max by
+        </Button>
+      </SpaceBetween>
+      <Button iconAlign="left" iconName="close" variant="normal" onClick={() => onAggregation('none')}>
+        Group without
+      </Button>
+    </SpaceBetween>
+  );
+}
+function FieldPopover({ fieldName, fieldValues, onAddValue, onAggregation }: FieldPopoverProps) {
+  return (
+    <Popover
+      content={
+        <SpaceBetween size="s">
+          {fieldValues.map((field, index) => (
+            <SpaceBetween key={index} alignItems="center" direction="horizontal" size="xs">
+              <Box fontSize="body-m" variant="span">
+                {field.value}
+              </Box>
+              <Button iconName="add-plus" variant="inline-icon" onClick={() => onAddValue(field.value)} />
+            </SpaceBetween>
+          ))}
+          <Box
+            margin={{
+              vertical: 'xs',
+            }}
+            variant="div"
+          />
+          <AggregationButtons onAggregation={onAggregation} />
+        </SpaceBetween>
+      }
+      dismissButton={true}
+      header={fieldName}
+      position="bottom"
+      size="medium"
+      triggerType="custom"
+    >
+      <Token
+        dismissLabel="Dismiss token"
+        variant="inline"
+        label={`${fieldName} (${fieldValues.length})`}
+        clickable={true}
+      />
+    </Popover>
+  );
+}
+function QueryBuilder() {
+  const handleAddValue = (fieldName: string, value: string) => {
+    console.log(`Adding value "${value}" from field "${fieldName}"`);
+  };
+  const handleAggregation = (fieldName: string, aggregationType: string) => {
+    console.log(`Applying "${aggregationType}" aggregation to field "${fieldName}"`);
+  };
+  const statusCodeValues: FieldValue[] = [
+    {
+      value: '200',
+    },
+    {
+      value: '503',
+    },
+    {
+      value: '500',
+    },
+  ];
+  const serverAddressValues: FieldValue[] = [
+    {
+      value: '192.168.1.1',
+    },
+    {
+      value: '10.0.0.1',
+    },
+    {
+      value: '172.16.0.5',
+    },
+  ];
+  return (
+    <AppLayoutToolbar
+      breadcrumbs={
+        <BreadcrumbGroup
+          items={[
+            {
+              href: '#',
+              text: 'Service',
+            },
+            {
+              href: '#',
+              text: 'Query builder',
+            },
+          ]}
+        />
+      }
+      content={
+        <SpaceBetween size="l">
+          <Header description="Group and aggregate fields to build your query." variant="h1">
+            Query builder
+          </Header>
+          <Container
+            header={
+              <Header description="Choose a field token to apply an aggregation function." variant="h2">
+                Group by fields
+              </Header>
+            }
+            data-venue="true"
+          >
+            <SpaceBetween alignItems="center" direction="horizontal" size="s">
+              <FieldPopover
+                fieldName="http.status_code"
+                fieldValues={statusCodeValues}
+                onAddValue={value => handleAddValue('http.status_code', value)}
+                onAggregation={type => handleAggregation('http.status_code', type)}
+              />
+              <FieldPopover
+                fieldName="server address"
+                fieldValues={serverAddressValues}
+                onAddValue={value => handleAddValue('server address', value)}
+                onAggregation={type => handleAggregation('server address', type)}
+              />
+            </SpaceBetween>
+          </Container>
+        </SpaceBetween>
+      }
+      contentType="default"
+      navigationHide={true}
+      toolsHide={true}
+    />
+  );
+}
+export default QueryBuilder;
diff --git a/src/token/interfaces.ts b/src/token/interfaces.ts
index 47bfa0d75a..84663f86c0 100644
--- a/src/token/interfaces.ts
+++ b/src/token/interfaces.ts
@@ -69,6 +69,8 @@ export interface TokenProps extends BaseComponentProps {
    * Only applies to plain text labels.
    */
   tooltipContent?: string;
+
+  clickable?: boolean;
 }
 
 export namespace TokenProps {
diff --git a/src/token/internal.tsx b/src/token/internal.tsx
index bd16485a73..470e92796b 100644
--- a/src/token/internal.tsx
+++ b/src/token/internal.tsx
@@ -39,6 +39,7 @@ function InternalToken({
   dismissLabel,
   onDismiss,
   tooltipContent,
+  clickable,
 
   // Internal
   role,
@@ -110,6 +111,7 @@ function InternalToken({
         testUtilStyles.root,
         !isInline ? styles['token-normal'] : styles['token-inline'],
         analyticsSelectors.token,
+        clickable && styles.clickable,
         baseProps.className
       )}
       aria-label={ariaLabel}
diff --git a/src/token/styles.scss b/src/token/styles.scss
index b00b7cfa2e..27b800a4bc 100644
--- a/src/token/styles.scss
+++ b/src/token/styles.scss
@@ -13,6 +13,10 @@
   @include styles.styles-reset;
 }
 
+.clickable {
+  cursor: pointer;
+}
+
 .dismiss-button {
   align-self: flex-start;
   margin-block-end: 0;

From 3bebc19c7c9758e15d0b12c3d02220df52e4fb05 Mon Sep 17 00:00:00 2001
From: Georgii Lobko <globko@amazon.de>
Date: Tue, 24 Mar 2026 16:04:13 +0100
Subject: [PATCH 2/2] chore: Upd snapshot

---
 .../snapshot-tests/__snapshots__/documenter.test.ts.snap     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/__tests__/snapshot-tests/__snapshots__/documenter.test.ts.snap b/src/__tests__/snapshot-tests/__snapshots__/documenter.test.ts.snap
index 9e92f77915..6c75c365b6 100644
--- a/src/__tests__/snapshot-tests/__snapshots__/documenter.test.ts.snap
+++ b/src/__tests__/snapshot-tests/__snapshots__/documenter.test.ts.snap
@@ -29755,6 +29755,11 @@ Use this if the label is not plain text.",
       "optional": true,
       "type": "string",
     },
+    {
+      "name": "clickable",
+      "optional": true,
+      "type": "boolean",
+    },
     {
       "description": "Further information about the token that appears below the label.",
       "name": "description",