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.

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

Cleanup some visual state bugs #5855

Merged
merged 3 commits into from
May 6, 2022
+1,412 −1,351
Merged

Cleanup some visual state bugs #5855

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3918822
Cleanup some visual state bugs
bheston Apr 16, 2022
16256ab
Change files
bheston Apr 16, 2022
addaf65
fix conflicts and remove menu base class
chrisdholt May 6, 2022
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
Prev Previous commit
fix conflicts and remove menu base class
  • Loading branch information
@chrisdholt
chrisdholt committed May 6, 2022
commit addaf6505ba5c3f6d0a9b10a582f51984e3405e5
40 changes: 12 additions & 28 deletions packages/web-components/fast-components/docs/api-report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,11 @@ export const allComponents: {
}, ListboxOption>;
fastMenu: (overrideDefinition?: OverrideFoundationElementDefinition< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<Menu, any>, FoundationElementDefinition>;
template: FoundationElementTemplate<ViewTemplate<Menu_2, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}> | undefined) => FoundationElementRegistry< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<Menu, any>, FoundationElementDefinition>;
template: FoundationElementTemplate<ViewTemplate<Menu_2, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}, Menu>;
fastMenuItem: (overrideDefinition?: OverrideFoundationElementDefinition<MenuItemOptions> | undefined) => FoundationElementRegistry<MenuItemOptions, Constructable<FoundationElement>>;
Expand Down Expand Up @@ -385,15 +385,7 @@ export const allComponents: {
template: FoundationElementTemplate<ViewTemplate<PickerListItem, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}, PickerListItem>;
fastPickerMenu: (overrideDefinition?: OverrideFoundationElementDefinition< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<PickerMenu, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}> | undefined) => FoundationElementRegistry< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<PickerMenu, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}, PickerMenu>;
fastPickerMenu: (overrideDefinition?: OverrideFoundationElementDefinition<FoundationElementDefinition> | undefined) => FoundationElementRegistry<FoundationElementDefinition, Constructable<FoundationElement>>;
fastPickerMenuOption: (overrideDefinition?: OverrideFoundationElementDefinition< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<PickerMenuOption, any>, FoundationElementDefinition>;
Expand Down Expand Up @@ -1033,11 +1025,11 @@ styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
// @public
export const fastMenu: (overrideDefinition?: OverrideFoundationElementDefinition< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<Menu, any>, FoundationElementDefinition>;
template: FoundationElementTemplate<ViewTemplate<Menu_2, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}> | undefined) => FoundationElementRegistry< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<Menu, any>, FoundationElementDefinition>;
template: FoundationElementTemplate<ViewTemplate<Menu_2, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}, typeof Menu>;

Expand Down Expand Up @@ -1094,15 +1086,7 @@ styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}, typeof PickerListItem>;

// @alpha
export const fastPickerMenu: (overrideDefinition?: OverrideFoundationElementDefinition< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<PickerMenu, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}> | undefined) => FoundationElementRegistry< {
baseName: string;
template: FoundationElementTemplate<ViewTemplate<PickerMenu, any>, FoundationElementDefinition>;
styles: FoundationElementTemplate<ElementStyles, FoundationElementDefinition>;
}, typeof PickerMenu>;
export const fastPickerMenu: (overrideDefinition?: OverrideFoundationElementDefinition<FoundationElementDefinition> | undefined) => FoundationElementRegistry<FoundationElementDefinition, Constructable<FoundationElement>>;

// @alpha
export const fastPickerMenuOption: (overrideDefinition?: OverrideFoundationElementDefinition< {
Expand Down Expand Up @@ -1673,7 +1657,7 @@ export const pickerListItemStyles: FoundationElementTemplate<ElementStyles>;

// @public (undocumented)
export class PickerMenu extends PickerMenu_2 {
// @internal (undocumented)
// (undocumented)
connectedCallback(): void;
}

Expand Down Expand Up @@ -1946,11 +1930,11 @@ export const verticalSliderLabelStyles: ElementStyles;
// dist/dts/custom-elements.d.ts:154:5 - (ae-incompatible-release-tags) The symbol "fastCard" is marked as @public, but its signature references "Card" which is marked as @internal
// dist/dts/custom-elements.d.ts:194:5 - (ae-incompatible-release-tags) The symbol "fastDesignSystemProvider" is marked as @public, but its signature references "DesignSystemProvider" which is marked as @internal
// dist/dts/custom-elements.d.ts:204:5 - (ae-incompatible-release-tags) The symbol "fastDisclosure" is marked as @public, but its signature references "Disclosure" which is marked as @internal
// dist/dts/custom-elements.d.ts:316:5 - (ae-incompatible-release-tags) The symbol "fastSearch" is marked as @public, but its signature references "Search" which is marked as @internal
// dist/dts/custom-elements.d.ts:344:5 - (ae-incompatible-release-tags) The symbol "fastSliderLabel" is marked as @public, but its signature references "SliderLabel" which is marked as @internal
// dist/dts/custom-elements.d.ts:383:5 - (ae-incompatible-release-tags) The symbol "fastTextArea" is marked as @public, but its signature references "TextArea" which is marked as @internal
// dist/dts/custom-elements.d.ts:400:5 - (ae-incompatible-release-tags) The symbol "fastTextField" is marked as @public, but its signature references "TextField" which is marked as @internal
// dist/dts/custom-elements.d.ts:418:5 - (ae-incompatible-release-tags) The symbol "fastToolbar" is marked as @public, but its signature references "Toolbar" which is marked as @internal
// dist/dts/custom-elements.d.ts:308:5 - (ae-incompatible-release-tags) The symbol "fastSearch" is marked as @public, but its signature references "Search" which is marked as @internal
// dist/dts/custom-elements.d.ts:336:5 - (ae-incompatible-release-tags) The symbol "fastSliderLabel" is marked as @public, but its signature references "SliderLabel" which is marked as @internal
// dist/dts/custom-elements.d.ts:375:5 - (ae-incompatible-release-tags) The symbol "fastTextArea" is marked as @public, but its signature references "TextArea" which is marked as @internal
// dist/dts/custom-elements.d.ts:392:5 - (ae-incompatible-release-tags) The symbol "fastTextField" is marked as @public, but its signature references "TextField" which is marked as @internal
// dist/dts/custom-elements.d.ts:410:5 - (ae-incompatible-release-tags) The symbol "fastToolbar" is marked as @public, but its signature references "Toolbar" which is marked as @internal

// (No @packageDocumentation comment for this package)

Expand Down
1 change: 0 additions & 1 deletion packages/web-components/fast-components/src/menu/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export class Menu extends FoundationMenu {
*/
export const fastMenu = Menu.compose({
baseName: "menu",
baseClass: FoundationMenu,
template,
styles,
});
Expand Down
13 changes: 7 additions & 6 deletions packages/web-components/fast-components/src/picker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import {
FoundationElementDefinition,
PickerMenu as FoundationPickerMenu,
Picker,
PickerList,
PickerListItem,
pickerListItemTemplate,
pickerListTemplate,
PickerMenu as FoundationPickerMenu,
PickerMenuOption,
pickerMenuOptionTemplate,
pickerMenuTemplate,
pickerTemplate,
} from "@microsoft/fast-foundation";
import { fillColor, neutralLayerFloating } from "../design-tokens.js";
import { pickerStyles } from "./picker.styles.js";
import { pickerMenuStyles } from "./picker-menu.styles.js";
import { pickerMenuOptionStyles } from "./picker-menu-option.styles.js";
import { pickerListStyles } from "./picker-list.styles.js";
import { pickerListItemStyles } from "./picker-list-item.styles.js";
import { fillColor, neutralLayerFloating } from "../design-tokens.js";

/**
* The FAST Picker Custom Element. Implements {@link @microsoft/fast-foundation#Picker},
Expand Down Expand Up @@ -44,12 +45,12 @@ export { Picker };
*/
export class PickerMenu extends FoundationPickerMenu {
/**
* @internal
* @public
*/
public connectedCallback(): void {
super.connectedCallback();

fillColor.setValueFor(this, neutralLayerFloating);

super.connectedCallback();
}
}

Expand All @@ -61,7 +62,7 @@ export class PickerMenu extends FoundationPickerMenu {
* @remarks
* HTML Element: \<fast-picker-menu\>
*/
export const fastPickerMenu = PickerMenu.compose({
export const fastPickerMenu = PickerMenu.compose<FoundationElementDefinition>({
baseName: "picker-menu",
baseClass: FoundationPickerMenu,
template: pickerMenuTemplate,
Expand Down