Fix `DataTable`'s `headingTextStyle` & `dataTextStyle` are not merged with default text style #134138

TahaTesser · 2023-09-06T14:00:10Z

fixes Inconsistent text color on DataTable in different platforms

Code sample

expand to view the code sample

import 'package:flutter/material.dart';

/// Flutter code sample for [DataTable].

void main() => runApp(const DataTableExampleApp());

class DataTableExampleApp extends StatelessWidget {
  const DataTableExampleApp({super.key});

  @override
  Widget build(BuildContext context) {
    return MaterialApp(
      themeMode: ThemeMode.dark,
      theme: ThemeData(),
      darkTheme: ThemeData.dark(),
      home: Scaffold(
        appBar: AppBar(title: const Text('DataTable Sample')),
        body: const DataTableExample(),
      ),
    );
  }
}

class DataTableExample extends StatelessWidget {
  const DataTableExample({super.key});

  @override
  Widget build(BuildContext context) {
    return DataTable(
      headingTextStyle: const TextStyle(),
      dataTextStyle: const TextStyle(),
      columns: const <DataColumn>[
        DataColumn(
          label: Expanded(
            child: Text(
              'Name',
              style: TextStyle(fontStyle: FontStyle.italic),
            ),
          ),
        ),
        DataColumn(
          label: Expanded(
            child: Text(
              'Age',
              style: TextStyle(fontStyle: FontStyle.italic),
            ),
          ),
        ),
        DataColumn(
          label: Expanded(
            child: Text(
              'Role',
              style: TextStyle(fontStyle: FontStyle.italic),
            ),
          ),
        ),
      ],
      rows: const <DataRow>[
        DataRow(
          cells: <DataCell>[
            DataCell(Text('Sarah')),
            DataCell(Text('19')),
            DataCell(Text('Student')),
          ],
        ),
        DataRow(
          cells: <DataCell>[
            DataCell(Text('Janine')),
            DataCell(Text('43')),
            DataCell(Text('Professor')),
          ],
        ),
        DataRow(
          cells: <DataCell>[
            DataCell(Text('William')),
            DataCell(Text('27')),
            DataCell(Text('Associate Professor')),
          ],
        ),
      ],
    );
  }
}

Before

Desktop	Mobile

After

Desktop	Mobile

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

HansMuller

LGTM

auto-submit · 2023-09-06T19:34:21Z

auto label is removed for flutter/flutter/134138, due to - The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label.

… with default text style

…t merged with default text style (flutter/flutter#134138)

Manual roll Flutter from 685ce14 to aea4552 (64 revisions) Manual roll requested by [email protected] flutter/flutter@685ce14...aea4552 2023-09-07 [email protected] add --exit flag to dev/devicelab/bin/test_runner.dart (flutter/flutter#134165) 2023-09-07 [email protected] fix `--exit` flag in dev/devicelab/bin/run.dart (flutter/flutter#134162) 2023-09-07 [email protected] Roll Packages from e7d812c to 22d4754 (9 revisions) (flutter/flutter#134232) 2023-09-07 [email protected] Roll Flutter Engine from 71bea01d3abe to f0b718e28779 (2 revisions) (flutter/flutter#134231) 2023-09-07 [email protected] DropdownRoutePage should dispose the created ScrollController. (flutter/flutter#133941) 2023-09-07 [email protected] Cover some test/widgets tests with leak tracking (flutter/flutter#133803) 2023-09-07 [email protected] SearchDelegate should dispose resources. (flutter/flutter#133948) 2023-09-07 [email protected] Fixed [NavigationRailDestination]'s label opacity while disabled not being coherent with the icon (flutter/flutter#132345) 2023-09-07 [email protected] Roll Flutter Engine from 558136a1ccbf to 71bea01d3abe (2 revisions) (flutter/flutter#134216) 2023-09-07 [email protected] Roll Flutter Engine from 5a45ecd24aa3 to 558136a1ccbf (1 revision) (flutter/flutter#134206) 2023-09-07 [email protected] Roll Flutter Engine from d864ae68db3c to 5a45ecd24aa3 (1 revision) (flutter/flutter#134201) 2023-09-07 [email protected] Fix `TabBar` doesn't use `labelStyle` & `unselectedLabelStyle` color (flutter/flutter#133989) 2023-09-07 [email protected] Fix `DataTable`'s `headingTextStyle` & `dataTextStyle` are not merged with default text style (flutter/flutter#134138) 2023-09-07 [email protected] Roll Flutter Engine from 187c5b3c5f71 to d864ae68db3c (2 revisions) (flutter/flutter#134199) 2023-09-07 [email protected] Reland "Fix `Chip.shape`'s side is not used when provided in Material 3" (flutter/flutter#133856) 2023-09-07 [email protected] Roll Flutter Engine from 75437a3bd002 to 187c5b3c5f71 (1 revision) (flutter/flutter#134193) 2023-09-07 [email protected] Manual roll Flutter Engine from 2c69d05dfafb to 75437a3bd002 (15 revisions) (flutter/flutter#134188) 2023-09-07 [email protected] Revert "Roll Flutter Engine from 2c69d05dfafb to fa14d337449b (6 revisions)" (flutter/flutter#134183) 2023-09-06 49699333+dependabot[bot]@users.noreply.github.com Bump actions/upload-artifact from 3.1.2 to 3.1.3 (flutter/flutter#134173) 2023-09-06 [email protected] Roll Flutter Engine from 2c69d05dfafb to fa14d337449b (6 revisions) (flutter/flutter#134169) 2023-09-06 [email protected] DraggableScrollableActuator should dispose notifier. (flutter/flutter#133917) 2023-09-06 [email protected] Roll Flutter Engine from b04c2a378302 to 2c69d05dfafb (3 revisions) (flutter/flutter#134164) 2023-09-06 [email protected] Clean the fixed TODOs. (flutter/flutter#133859) 2023-09-06 [email protected] Roll Flutter Engine from 839051596b1d to b04c2a378302 (7 revisions) (flutter/flutter#134158) 2023-09-06 [email protected] [Windows Arm64] Also use Windows 11 for Devicelab tests (flutter/flutter#134082) 2023-09-06 [email protected] Fix `subtitleTextStyle.color` isn't applied to the `ListTile.subtitle` in Material 2 (flutter/flutter#133422) 2023-09-06 [email protected] Add `CheckedPopupMenuItem.onTap` callback (flutter/flutter#134000) 2023-09-06 [email protected] MinimumTextContrastGuideline should dispose image. (flutter/flutter#133861) 2023-09-06 [email protected] [flutter_tools] Fix "FormatException: Invalid date format" during version freshness check (flutter/flutter#134088) 2023-09-06 [email protected] Fix not disposed items in Cupertino app and route. (flutter/flutter#134085) 2023-09-06 [email protected] Roll Flutter Engine from a5e7fa6bf81a to 839051596b1d (2 revisions) (flutter/flutter#134140) 2023-09-06 [email protected] _DropdownMenuState should dispose TextEditingController. (flutter/flutter#133914) 2023-09-06 [email protected] Roll Flutter Engine from 5253a33096d1 to a5e7fa6bf81a (1 revision) (flutter/flutter#134137) 2023-09-06 [email protected] Roll Flutter Engine from c7fd088291e2 to 5253a33096d1 (1 revision) (flutter/flutter#134135) 2023-09-06 [email protected] Roll Flutter Engine from 3d9989f1e155 to c7fd088291e2 (1 revision) (flutter/flutter#134132) 2023-09-06 [email protected] Roll Flutter Engine from bace539bb654 to 3d9989f1e155 (3 revisions) (flutter/flutter#134128) 2023-09-06 [email protected] Roll Flutter Engine from 9344685efbc3 to bace539bb654 (1 revision) (flutter/flutter#134104) 2023-09-06 [email protected] Roll Flutter Engine from 0c8c1647dcd0 to 9344685efbc3 (1 revision) (flutter/flutter#134103) 2023-09-06 [email protected] Roll Flutter Engine from 0c663258fd09 to 0c8c1647dcd0 (1 revision) (flutter/flutter#134100) 2023-09-06 [email protected] Roll Flutter Engine from 8bacc3b38707 to 0c663258fd09 (3 revisions) (flutter/flutter#134096) 2023-09-06 [email protected] Roll Flutter Engine from 590349006d23 to 8bacc3b38707 (5 revisions) (flutter/flutter#134089) 2023-09-06 [email protected] Roll Flutter Engine from 5b2cc9d9b8fe to 590349006d23 (2 revisions) (flutter/flutter#134081) 2023-09-05 [email protected] Roll Flutter Engine from 98b036ae708e to 5b2cc9d9b8fe (2 revisions) (flutter/flutter#134080) 2023-09-05 [email protected] Roll Flutter Engine from f4975e04f35e to 98b036ae708e (3 revisions) (flutter/flutter#134077) ...

…t merged with default text style (flutter/flutter#134138)

github-actions bot added framework flutter/packages/flutter repository. See also f: labels. f: material design flutter/packages/flutter/material repository. labels Sep 6, 2023

TahaTesser marked this pull request as ready for review September 6, 2023 14:51

TahaTesser requested a review from HansMuller September 6, 2023 17:00

HansMuller approved these changes Sep 6, 2023

View reviewed changes

HansMuller added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 6, 2023

TahaTesser force-pushed the fix_data_table_default_text_style branch from 637ae0a to 85539f6 Compare September 6, 2023 18:44

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Sep 6, 2023

TahaTesser force-pushed the fix_data_table_default_text_style branch from 85539f6 to 019c2c0 Compare September 6, 2023 19:42

Fix DataTable's headingTextStyle & dataTextStyle are not merged…

eb284a4

… with default text style

TahaTesser force-pushed the fix_data_table_default_text_style branch from 019c2c0 to eb284a4 Compare September 7, 2023 07:07

TahaTesser added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 7, 2023

auto-submit bot merged commit 75797a8 into flutter:master Sep 7, 2023

TahaTesser deleted the fix_data_table_default_text_style branch September 7, 2023 08:56

engine-flutter-autoroll mentioned this pull request Sep 7, 2023

Roll Flutter from c175cf87a6a3 to bbf5d11aadb4 (111 revisions) flutter/packages#4864

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 7, 2023

75797a8 Fix DataTable's headingTextStyle & dataTextStyle are no…

2e2ba6f

…t merged with default text style (flutter/flutter#134138)

engine-flutter-autoroll mentioned this pull request Sep 7, 2023

Roll Flutter from c175cf87a6a3 to 6ddb3b04b4fe (112 revisions) flutter/packages#4865

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 7, 2023

75797a8 Fix DataTable's headingTextStyle & dataTextStyle are no…

4a01d61

…t merged with default text style (flutter/flutter#134138)

engine-flutter-autoroll mentioned this pull request Sep 7, 2023

Roll Flutter from c175cf87a6a3 to 2867b31f5ed4 (113 revisions) flutter/packages#4867

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 7, 2023

75797a8 Fix DataTable's headingTextStyle & dataTextStyle are no…

9ef3d91

…t merged with default text style (flutter/flutter#134138)

engine-flutter-autoroll mentioned this pull request Sep 7, 2023

Roll Flutter from c175cf87a6a3 to aca91df6b784 (115 revisions) flutter/packages#4868

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 7, 2023

75797a8 Fix DataTable's headingTextStyle & dataTextStyle are no…

654233f

…t merged with default text style (flutter/flutter#134138)

engine-flutter-autoroll mentioned this pull request Sep 7, 2023

Roll Flutter from c175cf87a6a3 to ea351694fe5b (118 revisions) flutter/packages#4869

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 7, 2023

75797a8 Fix DataTable's headingTextStyle & dataTextStyle are no…

3519d24

…t merged with default text style (flutter/flutter#134138)

engine-flutter-autoroll mentioned this pull request Sep 7, 2023

Manual roll Flutter from 685ce14b2d0f to aea4552acdc7 (64 revisions) flutter/packages#4870

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 7, 2023

75797a8 Fix DataTable's headingTextStyle & dataTextStyle are no…

950a226

…t merged with default text style (flutter/flutter#134138)

HansMuller mentioned this pull request Sep 8, 2023

Flutter Framework Team: Notable Commits #121415

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 15, 2023

75797a8 Fix DataTable's headingTextStyle & dataTextStyle are no…

d3cf420

…t merged with default text style (flutter/flutter#134138)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix `DataTable`'s `headingTextStyle` & `dataTextStyle` are not merged with default text style #134138

Fix `DataTable`'s `headingTextStyle` & `dataTextStyle` are not merged with default text style #134138

Uh oh!

TahaTesser commented Sep 6, 2023 •

edited

Loading

Uh oh!

HansMuller left a comment

Uh oh!

auto-submit bot commented Sep 6, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Fix DataTable's headingTextStyle & dataTextStyle are not merged with default text style #134138

Fix DataTable's headingTextStyle & dataTextStyle are not merged with default text style #134138

Uh oh!

Conversation

TahaTesser commented Sep 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code sample

Before

After

Pre-launch Checklist

Uh oh!

HansMuller left a comment

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Sep 6, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Fix `DataTable`'s `headingTextStyle` & `dataTextStyle` are not merged with default text style #134138

Fix `DataTable`'s `headingTextStyle` & `dataTextStyle` are not merged with default text style #134138

TahaTesser commented Sep 6, 2023 •

edited

Loading