Support different kinds of button without variants

.dojorc

@@ -42,15 +42,13 @@
 			"src/chip-typeahead",
 			"src/native-select",
 			"src/number-input",
-			"src/outlined-button",
 			"src/pagination",
 			"src/password-input",
 			"src/popup",
 			"src/popup-confirmation",
 			"src/progress",
 			"src/radio",
 			"src/radio-group",
-			"src/raised-button",
 			"src/range-slider",
 			"src/rate",
 			"src/result",

package.json

@@ -106,7 +106,7 @@
     "prettier": "1.17.0",
     "shx": "^0.2.2",
     "sinon": "^4.1.3",
-    "typescript": "~3.4.5"
+    "typescript": "~3.5.3"
   },
   "dependencies": {
     "tslib": "~1.9.1"

src/accordion/index.tsx

@@ -1,3 +1,4 @@
+import Set from '@dojo/framework/shim/Set';
 import * as css from '../theme/default/accordion.m.css';
 import * as titlePaneCss from '../theme/default/title-pane.m.css';
 import TitlePane from '../title-pane';

src/button/README.md

@@ -1,6 +1,6 @@
 # @dojo/widgets/button
 
-Dojo's `Button` widget creates a `<button>` element with support `pressed` and `disabled` states.
+Dojo's `Button` widget creates a `<button>` element with support `disabled` states.
 
 ## Features
 
@@ -15,4 +15,3 @@ Icon only buttons will be sized to support a `24px` icon instead of the default
 ### Accessibility Features
 
 - The basic button provides a strongly typed `type` property, as well as `disabled`
-- Setting `pressed` to create a toggle button handles `aria-pressed`

src/button/index.tsx

@@ -27,8 +27,6 @@ export interface ButtonProperties {
 	onOver?(): void;
 	/** Handler for events triggered by "on up" */
 	onUp?(): void;
-	/** Indicates status of a toggle button */
-	pressed?: boolean;
 	/** Button type can be "submit", "reset", "button", or "menu" */
 	type?: 'submit' | 'reset' | 'button' | 'menu';
 	/**  Defines a value for the button submitted with form data */
@@ -38,7 +36,7 @@ export interface ButtonProperties {
 	/** The title text for the button node */
 	title?: string;
 	/** The kind of button */
-	kind?: 'primary' | 'secondary' | 'default';
+	kind?: 'contained' | 'outlined' | 'text';
 	/** Where to add the icon. Default to "before" */
 	iconPosition?: 'before' | 'after';
 }
@@ -65,7 +63,6 @@ export const Button = factory(function Button({
 		disabled,
 		widgetId,
 		name,
-		pressed,
 		type = 'button',
 		value,
 		onClick,
@@ -76,7 +73,7 @@ export const Button = factory(function Button({
 		onBlur,
 		onFocus,
 		title,
-		kind = 'default',
+		kind = 'contained',
 		iconPosition = 'before'
 	} = properties();
 
@@ -96,9 +93,9 @@ export const Button = factory(function Button({
 				theme.variant(),
 				themeCss.root,
 				disabled ? themeCss.disabled : null,
-				pressed ? themeCss.pressed : null,
-				kind === 'secondary' ? themeCss.secondaryKind : null,
-				kind === 'default' ? themeCss.defaultKind : null,
+				kind === 'text' ? themeCss.text : null,
+				kind === 'contained' ? themeCss.contained : null,
+				kind === 'outlined' ? themeCss.outlined : null,
 				iconOnly ? themeCss.iconOnly : null
 			]}
 			title={title}
@@ -119,7 +116,6 @@ export const Button = factory(function Button({
 			onpointerdown={() => onDown && onDown()}
 			onpointerup={() => onUp && onUp()}
 			{...formatAriaProperties(aria)}
-			aria-pressed={typeof pressed === 'boolean' ? (pressed ? 'true' : 'false') : undefined}
 		>
 			{icon && iconPosition === 'before' ? iconSpan : undefined}
 			{label ? <span classes={themeCss.label}>{label}</span> : undefined}