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

Use component template colocation instead of pods #975

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ declare module '@glint/environment-ember-loose/registry' {
```ts
// my-table-component.ts
import type { EmberTableColumn, EmberTableRow } from 'ember-table';
import EmberTableComponent from 'ember-table/components/ember-table/component';
import EmberTableComponent from 'ember-table/components/ember-table';

interface MyTableColumn extends EmberTableColumn {
// Add any custom column attribute types here (optional)
Expand Down
6 changes: 3 additions & 3 deletions addon-test-support/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import TablePage from './pages/ember-table';
import registerWaiter from 'ember-raf-scheduler/test-support/register-waiter';
import { setSetupRowCountForTest } from 'ember-table/components/ember-tbody/component';
import { setupTHeadForTest } from 'ember-table/components/ember-thead/component';
import { setSimpleCheckboxForTest } from 'ember-table/components/ember-td/component';
import { setSetupRowCountForTest } from 'ember-table/components/ember-tbody';
import { setupTHeadForTest } from 'ember-table/components/ember-thead';
import { setSimpleCheckboxForTest } from 'ember-table/components/ember-td';

function setupForTest() {
registerWaiter();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { capitalize } from '@ember/string';
import { htmlSafe } from '@ember/template';
import { isEmpty, isNone } from '@ember/utils';
import { addObserver } from 'ember-table/-private/utils/observer';
import layout from './template';

/**
Computed property macro that builds the CSS styles (position, height)
Expand Down Expand Up @@ -122,7 +121,6 @@ const showIndicator = location => {
};

export default Component.extend({
layout,
tagName: '',

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import {
teardownTableStickyPolyfill,
} from '../../-private/sticky/table-sticky-polyfill';

import layout from './template';

/**
The primary Ember Table component. This component represents the root of the
table, and manages high level state of all of its subcomponents. It does not
Expand All @@ -30,7 +28,6 @@ import layout from './template';
@public
*/
export default Component.extend({
layout,
classNames: ['ember-table'],
attributeBindings: ['dataTestEmberTable:data-test-ember-table'],
dataTestEmberTable: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { bool, readOnly, or } from '@ember/object/computed';
import CollapseTree, { SELECT_MODE } from '../../-private/collapse-tree';
import defaultTo from '../../-private/utils/default-to';

import layout from './template';
import { assert } from '@ember/debug';

let setupRowCountForTest = false;
Expand Down Expand Up @@ -40,7 +39,6 @@ export function setSetupRowCountForTest(bool) {
@public
*/
export default Component.extend({
layout,
tagName: 'tbody',

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import BaseTableCell from '../-private/base-table-cell';
import { computed } from '@ember/object';
import { alias, readOnly } from '@ember/object/computed';

import layout from './template';
import { SELECT_MODE } from '../../-private/collapse-tree';

let setupSimpleCheckboxForTest = false;
Expand Down Expand Up @@ -41,7 +40,6 @@ export function setSimpleCheckboxForTest(bool) {
@public
*/
export default BaseTableCell.extend({
layout,
tagName: 'td',

init() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import EmberTBody from '../ember-tbody/component';
import EmberTBody from '../ember-tbody';
import { A as emberA } from '@ember/array';

import { computed } from '@ember/object';

import layout from './template';

/**
The table footer component. This component manages any footer rows which may
be attached to the table, and has the same API as EmberTBody. It does not
Expand All @@ -30,7 +28,6 @@ import layout from './template';
@public
*/
export default EmberTBody.extend({
layout,
tagName: 'tfoot',

wrappedRowArray: computed('wrappedRows.[]', function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { next } from '@ember/runloop';
import { readOnly } from '@ember/object/computed';
import { closest } from '../../-private/utils/element';

import layout from './template';
import { get } from '@ember/object';

const COLUMN_INACTIVE = 0;
Expand Down Expand Up @@ -35,7 +34,6 @@ const COLUMN_REORDERING = 2;
@public
*/
export default BaseTableCell.extend({
layout,
tagName: 'th',
attributeBindings: ['columnSpan:colspan', 'rowSpan:rowspan'],
classNameBindings: ['isSortable', 'isResizable', 'isReorderable'],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Component from '@ember/component';
import layout from './template';

import { readOnly } from '@ember/object/computed';

Expand All @@ -25,7 +24,6 @@ import { readOnly } from '@ember/object/computed';
@public
*/
export default Component.extend({
layout,
tagName: '',

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Component from '@ember/component';
import layout from './template';

import { readOnly } from '@ember/object/computed';

Expand All @@ -26,7 +25,6 @@ import { readOnly } from '@ember/object/computed';
*/

export default Component.extend({
layout,
tagName: '',

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import { scheduleOnce } from '@ember/runloop';

import ColumnTree, { RESIZE_MODE, FILL_MODE, WIDTH_CONSTRAINT } from '../../-private/column-tree';

import layout from './template';

let isTestingThead = false;
export function setupTHeadForTest(bool) {
isTestingThead = bool;
Expand Down Expand Up @@ -45,7 +43,6 @@ export function setupTHeadForTest(bool) {
*/

export default Component.extend({
layout,
tagName: 'thead',

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { readOnly } from '@ember/object/computed';

import { closest } from '../../-private/utils/element';

import layout from './template';
import { SELECT_MODE } from '../../-private/collapse-tree';

/**
Expand Down Expand Up @@ -45,7 +44,6 @@ import { SELECT_MODE } from '../../-private/collapse-tree';
@public
*/
export default Component.extend({
layout,
tagName: 'tr',
classNames: ['et-tr'],
classNameBindings: ['isSelected', 'isGroupSelected', 'isSelectable'],
Expand Down
2 changes: 1 addition & 1 deletion app/components/ember-table-loading-more.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-table-loading-more/component';
export { default } from 'ember-table/components/ember-table-loading-more';
2 changes: 1 addition & 1 deletion app/components/ember-table-private/scroll-indicators.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/-private/scroll-indicators/component';
export { default } from 'ember-table/components/-private/scroll-indicators';
2 changes: 1 addition & 1 deletion app/components/ember-table.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-table/component';
export { default } from 'ember-table/components/ember-table';
2 changes: 1 addition & 1 deletion app/components/ember-tbody.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-tbody/component';
export { default } from 'ember-table/components/ember-tbody';
2 changes: 1 addition & 1 deletion app/components/ember-td.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-td/component';
export { default } from 'ember-table/components/ember-td';
2 changes: 1 addition & 1 deletion app/components/ember-tfoot.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-tfoot/component';
export { default } from 'ember-table/components/ember-tfoot';
2 changes: 1 addition & 1 deletion app/components/ember-th.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-th/component';
export { default } from 'ember-table/components/ember-th';
2 changes: 1 addition & 1 deletion app/components/ember-th/resize-handle.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-th/resize-handle/component';
export { default } from 'ember-table/components/ember-th/resize-handle';
2 changes: 1 addition & 1 deletion app/components/ember-th/sort-indicator.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-th/sort-indicator/component';
export { default } from 'ember-table/components/ember-th/sort-indicator';
2 changes: 1 addition & 1 deletion app/components/ember-thead.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-thead/component';
export { default } from 'ember-table/components/ember-thead';
2 changes: 1 addition & 1 deletion app/components/ember-tr.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-table/components/ember-tr/component';
export { default } from 'ember-table/components/ember-tr';
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Component from '@ember/component';
import { EmberTableColumn, EmberTableRow } from 'ember-table';
import EmberTbodyComponent from 'ember-table/components/ember-tbody/component';
import EmberTfootComponent from 'ember-table/components/ember-tfoot/component';
import EmberTheadComponent from 'ember-table/components/ember-thead/component';
import EmberTableLoadingMoreComponent from 'ember-table/components/ember-table-loading-more/component';
import EmberTbodyComponent from 'ember-table/components/ember-tbody';
import EmberTfootComponent from 'ember-table/components/ember-tfoot';
import EmberTheadComponent from 'ember-table/components/ember-thead';
import EmberTableLoadingMoreComponent from 'ember-table/components/ember-table-loading-more';

export interface EmberTableSignature<
RowType extends EmberTableRow,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Component from '@ember/component';
import { EmberTableColumn, EmberTableRow } from 'ember-table';
import EmberTrComponent from 'ember-table/components/ember-tr/component';
import EmberTrComponent from 'ember-table/components/ember-tr';

type SelectionMode =
| 'multiple'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Component from '@ember/component';
import { EmberTableColumn, EmberTableRow } from 'ember-table';
import EmberTrComponent from 'ember-table/components/ember-tr/component';
import EmberTrComponent from 'ember-table/components/ember-tr';

export interface EmberTfootSignature<
RowType extends EmberTableRow,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@ember/component';
import { EmberTableColumn, EmberTableRow, EmberTableSort } from 'ember-table';
import EmberThComponent from 'ember-table/components/ember-th/component';
import EmberTrComponent from 'ember-table/components/ember-tr/component';
import EmberThComponent from 'ember-table/components/ember-th';
import EmberTrComponent from 'ember-table/components/ember-tr';

type FillMode =
| 'equal-column'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Component from '@ember/component';
import { EmberTableColumn, EmberTableRow } from 'ember-table';
import EmberTdComponent from 'ember-table/components/ember-td/component';
import EmberTdComponent from 'ember-table/components/ember-td';

export interface EmberTrSignature<
RowType extends EmberTableRow,
Expand Down
6 changes: 3 additions & 3 deletions types/template-registry.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import EmberTableComponent from 'ember-table/components/ember-table/component';
import ResizeHandleComponent from 'ember-table/components/ember-th/resize-handle/component';
import SortIndicatorComponent from 'ember-table/components/ember-th/sort-indicator/component';
import EmberTableComponent from 'ember-table/components/ember-table';
import ResizeHandleComponent from 'ember-table/components/ember-th/resize-handle';
import SortIndicatorComponent from 'ember-table/components/ember-th/sort-indicator';

export default interface Registry {
EmberTable: typeof EmberTableComponent;
Expand Down