-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 1229-tree-grid-cell-alignment
- Loading branch information
Showing
15 changed files
with
344 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title><%= htmlWebpackPlugin.options.title %></title> | ||
| <%= htmlWebpackPlugin.options.font %> | ||
| </head> | ||
| <body> | ||
| <ids-container role="main" padding="8" hidden> | ||
| <ids-toolbar> | ||
| <ids-toolbar-section align="end" type="fluid"> | ||
| <ids-menu-button menu="add-event" value="${view}"> | ||
| <ids-icon icon="add"></ids-icon> | ||
| <span class="audible">Add Event</span> | ||
| </ids-menu-button> | ||
| <ids-popup-menu id="add-event" trigger="click"> | ||
| <ids-menu-group> | ||
| <ids-menu-item value="add-api"> | ||
| <ids-text>Add Event (API)</ids-text> | ||
| </ids-menu-item> | ||
| <ids-menu-item value="add-modal"> | ||
| <ids-text>Add Event (Modal)</ids-text> | ||
| </ids-menu-item> | ||
| <ids-menu-item value="clear"> | ||
| <ids-text>Clear Events</ids-text> | ||
| </ids-menu-item> | ||
| </ids-menu-group> | ||
| </ids-popup-menu> | ||
|
|
||
| <ids-theme-switcher mode="light" version="new"></ids-theme-switcher> | ||
| </ids-toolbar-section> | ||
| </ids-toolbar> | ||
| <ids-layout-grid auto-fit="true" padding="md"> | ||
| <ids-text font-size="12" type="h1">Calendar View</ids-text> | ||
| </ids-layout-grid> | ||
| <ids-layout-grid auto-fit="true" padding-x="md"> | ||
| <ids-layout-grid-cell> | ||
| <ids-calendar date="10/22/2019" view-picker first-day-of-week="6"></ids-calendar> | ||
| </ids-layout-grid-cell> | ||
| </ids-layout-grid> | ||
| </ids-container> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import eventsJSON from '../../../assets/data/events.json'; | ||
| import eventTypesJSON from '../../../assets/data/event-types.json'; | ||
|
|
||
| const eventsURL: any = eventsJSON; | ||
| const eventTypesURL: any = eventTypesJSON; | ||
|
|
||
| /** | ||
| * Fetch events.json | ||
| * @returns {Promise} events.json content | ||
| */ | ||
| function getCalendarEvents(): Promise<any> { | ||
| return fetch(eventsURL).then((res) => res.json()); | ||
| } | ||
|
|
||
| /** | ||
| * Fetch event-types.json | ||
| * @returns {Promise} event-types.json content | ||
| */ | ||
| function getEventTypes(): Promise<any> { | ||
| return fetch(eventTypesURL).then((res) => res.json()); | ||
| } | ||
|
|
||
| document.addEventListener('DOMContentLoaded', async () => { | ||
| const calendar: any = document.querySelector('ids-calendar'); | ||
|
|
||
| // Set event types | ||
| calendar.eventTypesData = await getEventTypes(); | ||
| calendar.eventsData = await getCalendarEvents(); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
src/components/ids-data-grid/demos/columns-checkbox-alignment.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title><%= htmlWebpackPlugin.options.title %></title> | ||
| <%= htmlWebpackPlugin.options.font %> | ||
| </head> | ||
| <body> | ||
| <ids-container role="main" padding="8" hidden> | ||
| <ids-theme-switcher mode="light"></ids-theme-switcher> | ||
| <ids-layout-grid auto-fit="true" padding="md"> | ||
| <ids-text font-size="12" type="h1">Data Grid (Alignment)</ids-text> | ||
| </ids-layout-grid> | ||
| <ids-layout-grid auto-fit="true" padding-x="md"> | ||
| <ids-layout-grid-cell> | ||
| <ids-toolbar> | ||
| <ids-toolbar-section align="end" favor> | ||
| <ids-menu-button id="menu-button" menu="row-height-menu"> | ||
| <ids-icon icon="more"></ids-icon> | ||
| <span class="audible">Settings Menu Button</span> | ||
| </ids-menu-button> | ||
| <ids-popup-menu id="row-height-menu" target="menu-button" trigger-type="click"> | ||
| <ids-menu-group select="single"> | ||
| <ids-menu-header><ids-text font-weight="semi-bold">Style</ids-text></ids-menu-header> | ||
| <ids-menu-item value="is-list" toggleable>List</ids-menu-item> | ||
| </ids-menu-group> | ||
| <ids-menu-group select="single"> | ||
| <ids-menu-header><ids-text font-weight="semi-bold">Row Height</ids-text></ids-menu-header> | ||
| <ids-menu-item value="xxs">Extra Extra Small</ids-menu-item> | ||
| <ids-menu-item value="xs">Extra Small</ids-menu-item> | ||
| <ids-menu-item value="sm">Small</ids-menu-item> | ||
| <ids-menu-item value="md" selected="true">Medium</ids-menu-item> | ||
| <ids-menu-item value="lg">Large</ids-menu-item> | ||
| </ids-menu-group> | ||
| </ids-popup-menu> | ||
| </ids-toolbar-section> | ||
| </ids-toolbar> | ||
|
|
||
| <ids-data-grid id="data-grid-alignment" label="Books"></ids-data-grid> | ||
| </ids-layout-grid-cell> | ||
| </ids-layout-grid> | ||
| </ids-container> | ||
| </body> | ||
| </html> |
78 changes: 78 additions & 0 deletions
78
src/components/ids-data-grid/demos/columns-checkbox-alignment.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import type IdsDataGrid from '../ids-data-grid'; | ||
| import type IdsPopupMenu from '../../ids-popup-menu/ids-popup-menu'; | ||
| import type IdsMenuItem from '../../ids-menu/ids-menu-item'; | ||
| import '../ids-data-grid'; | ||
| import type { IdsDataGridColumn } from '../ids-data-grid-column'; | ||
| import booksJSON from '../../../assets/data/books.json'; | ||
|
|
||
| // Example for populating the DataGrid | ||
| const dataGrid = document.querySelector<IdsDataGrid>('#data-grid-alignment')!; | ||
| const rowHeightMenu = document.querySelector<IdsPopupMenu>('#row-height-menu')!; | ||
|
|
||
| // Change row height with popup menu | ||
| rowHeightMenu?.addEventListener('selected', (e: Event) => { | ||
| const value = (e.target as IdsMenuItem).value; | ||
| if (value !== 'is-list') { | ||
| dataGrid.rowHeight = value as string; | ||
| } | ||
| if (value === 'is-list') { | ||
| dataGrid.listStyle = !dataGrid.listStyle; | ||
| } | ||
| }); | ||
|
|
||
| rowHeightMenu?.addEventListener('deselected', (e: Event) => { | ||
| const value = (e.target as IdsMenuItem).value; | ||
| if (value === 'is-list') { | ||
| dataGrid.listStyle = !dataGrid.listStyle; | ||
| } | ||
| }); | ||
|
|
||
| if (dataGrid) { | ||
| (async function init() { | ||
| // Do an ajax request | ||
| const url: any = booksJSON; | ||
| const columns: IdsDataGridColumn[] = []; | ||
|
|
||
| // Set up columns | ||
| columns.push({ | ||
| id: 'description', | ||
| name: 'ID', | ||
| field: 'description', | ||
| sortable: true, | ||
| formatter: dataGrid.formatters.text | ||
| }); | ||
| columns.push({ | ||
| id: 'inStock', | ||
| name: 'Checkbox (left)', | ||
| field: 'inStock', | ||
| formatter: dataGrid.formatters.checkbox, | ||
| sortable: true, | ||
| align: 'left' | ||
| }); | ||
| columns.push({ | ||
| id: 'inStock', | ||
| name: 'Checkbox (center)', | ||
| field: 'inStock', | ||
| formatter: dataGrid.formatters.checkbox, | ||
| sortable: true, | ||
| align: 'center' | ||
| }); | ||
| columns.push({ | ||
| id: 'inStock', | ||
| name: 'Checkbox (right)', | ||
| field: 'inStock', | ||
| formatter: dataGrid.formatters.checkbox, | ||
| sortable: true, | ||
| align: 'right' | ||
| }); | ||
|
|
||
| dataGrid.columns = columns; | ||
| const setData = async () => { | ||
| const res = await fetch(url); | ||
| const data = await res.json(); | ||
| dataGrid.data = data; | ||
| }; | ||
|
|
||
| setData(); | ||
| }()); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.