geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-12 19:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4500 from oleibman/office2023theme

Browse Source 
Support Current Office Theme
This commit is contained in:
oleibman
2025-06-18 04:20:29 +00:00
committed by GitHub
parent 44c3bd564b eb486262fa
commit 84b7ab93fa
4 changed files with 139 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/Chart33a/33_Chart_create_area_2.php
+1 -1
View File
@@ -13,7 +13,7 @@ require __DIR__ . '/../Header.php';
/** @var PhpOffice\PhpSpreadsheet\Helper\Sample $helper */
$spreadsheet = new Spreadsheet();
// same as 33_Chart_create_area, but with 2013+ schemes
$spreadsheet->getTheme()->setThemeColorName(SpreadsheetTheme::COLOR_SCHEME_2013_PLUS_NAME);
$spreadsheet->getTheme()->setThemeColorName(SpreadsheetTheme::COLOR_SCHEME_2013_2022_NAME);
$worksheet = $spreadsheet->getActiveSheet();
$worksheet->fromArray(
[
src/PhpSpreadsheet/Style/Font.php
+9
View File
@@ -3,6 +3,7 @@
namespace PhpOffice\PhpSpreadsheet\Style;
use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
use PhpOffice\PhpSpreadsheet\Theme;
class Font extends Supervisor
{
@@ -124,6 +125,14 @@ class Font extends Supervisor
}
}
public function applyThemeFonts(Theme $theme): void
{
$this->setName($theme->getMinorFontLatin());
$this->setLatin($theme->getMinorFontLatin());
$this->setEastAsian($theme->getMinorFontEastAsian());
$this->setComplexScript($theme->getMinorFontComplexScript());
}
/**
* Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor.
src/PhpSpreadsheet/Theme.php
+42 -5
View File
@@ -9,8 +9,8 @@ class Theme
private string $themeFontName = 'Office';
public const HYPERLINK_THEME = 10;
public const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
public const COLOR_SCHEME_2013_PLUS = [
public const COLOR_SCHEME_2013_2022_NAME = 'Office 2013-2022';
public const COLOR_SCHEME_2013_2022 = [
'dk1' => '000000',
'lt1' => 'FFFFFF',
'dk2' => '44546A',
@@ -24,6 +24,10 @@ class Theme
'hlink' => '0563C1',
'folHlink' => '954F72',
];
/** @deprecated 4.4.0 Use COLOR_SCHEME_2013_2022_NAME */
public const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
/** @deprecated 4.4.0 Use COLOR_SCHEME_2013_2022 */
public const COLOR_SCHEME_2013_PLUS = self::COLOR_SCHEME_2013_2022;
public const COLOR_SCHEME_2007_2010_NAME = 'Office 2007-2010';
public const COLOR_SCHEME_2007_2010 = [
@@ -41,6 +45,22 @@ class Theme
'folHlink' => '800080',
];
public const COLOR_SCHEME_2023_PLUS_NAME = 'Office 2023+';
public const COLOR_SCHEME_2023_PLUS = [
'dk1' => '000000',
'lt1' => 'FFFFFF',
'dk2' => '0E2841',
'lt2' => 'E8E8E8',
'accent1' => '156082',
'accent2' => 'E97132',
'accent3' => '196B24',
'accent4' => '0F9ED5',
'accent5' => 'A02B93',
'accent6' => '4EA72E',
'hlink' => '467886',
'folHlink' => '96607D',
];
/** @var string[] */
private array $themeColors = self::COLOR_SCHEME_2007_2010;
@@ -155,17 +175,34 @@ class Theme
}
/** @param null|string[] $themeColors */
public function setThemeColorName(string $name, ?array $themeColors = null): self
public function setThemeColorName(string $name, ?array $themeColors = null, ?Spreadsheet $spreadsheet = null): self
{
$this->themeColorName = $name;
if ($name === self::COLOR_SCHEME_2007_2010_NAME) {
$themeColors = $themeColors ?? self::COLOR_SCHEME_2007_2010;
} elseif ($name === self::COLOR_SCHEME_2013_PLUS_NAME) {
$themeColors = $themeColors ?? self::COLOR_SCHEME_2013_PLUS;
$this->majorFontLatin = 'Cambria';
$this->minorFontLatin = 'Calibri';
} elseif ($name === self::COLOR_SCHEME_2013_PLUS_NAME) { //* @phpstan-ignore-line
// delete this block when deprecated constants removed
$themeColors = $themeColors ?? self::COLOR_SCHEME_2013_PLUS; //* @phpstan-ignore-line
$this->majorFontLatin = 'Calibri Light';
$this->minorFontLatin = 'Calibri';
} elseif ($name === self::COLOR_SCHEME_2013_2022_NAME) {
$themeColors = $themeColors ?? self::COLOR_SCHEME_2013_2022;
$this->majorFontLatin = 'Calibri Light';
$this->minorFontLatin = 'Calibri';
} elseif ($name === self::COLOR_SCHEME_2023_PLUS_NAME) {
$themeColors = $themeColors ?? self::COLOR_SCHEME_2023_PLUS;
$this->majorFontLatin = 'Aptos Display';
$this->minorFontLatin = 'Aptos Narrow';
}
if ($themeColors !== null) {
$this->themeColors = $themeColors;
}
if ($spreadsheet !== null) {
$spreadsheet->getDefaultStyle()->getFont()
->applyThemeFonts($this);
}
return $this;
}
tests/PhpSpreadsheetTests/Writer/Xlsx/ThemeColorsTest.php
+87 -2
View File
@@ -6,6 +6,7 @@ namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Style\Style;
use PhpOffice\PhpSpreadsheet\Theme as SpreadsheetTheme;
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
@@ -14,11 +15,48 @@ class ThemeColorsTest extends AbstractFunctional
public function testOffice2013Theme(): void
{
$spreadsheet = new Spreadsheet();
$spreadsheet->getTheme()->setThemeColorName(SpreadsheetTheme::COLOR_SCHEME_2013_PLUS_NAME);
$spreadsheet->getTheme()
->setThemeColorName(
SpreadsheetTheme::COLOR_SCHEME_2013_PLUS_NAME //* @phpstan-ignore-line
);
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
$spreadsheet->disconnectWorksheets();
self::assertSame('Office 2013+', $reloadedSpreadsheet->getTheme()->getThemeColorName());
self::assertSame(
SpreadsheetTheme::COLOR_SCHEME_2013_PLUS_NAME, //* @phpstan-ignore-line
$reloadedSpreadsheet->getTheme()->getThemeColorName()
);
self::assertSame('FFC000', $reloadedSpreadsheet->getTheme()->getThemeColors()['accent4']);
self::assertSame('Calibri Light', $reloadedSpreadsheet->getTheme()->getMajorFontLatin());
self::assertSame('Calibri', $reloadedSpreadsheet->getTheme()->getMinorFontLatin());
$defaultFont2 = $reloadedSpreadsheet->getDefaultStyle()->getFont()->getName();
self::assertSame('Calibri', $defaultFont2);
$font3 = $reloadedSpreadsheet->getActiveSheet()
->getStyle('Z10')->getFont()->getName();
self::assertSame('Calibri', $font3);
$reloadedSpreadsheet->disconnectWorksheets();
}
public function testOffice2013Theme2(): void
{
$spreadsheet = new Spreadsheet();
$spreadsheet->getTheme()
->setThemeColorName(
SpreadsheetTheme::COLOR_SCHEME_2013_2022_NAME
);
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
$spreadsheet->disconnectWorksheets();
self::assertSame(
SpreadsheetTheme::COLOR_SCHEME_2013_2022_NAME,
$reloadedSpreadsheet->getTheme()->getThemeColorName()
);
self::assertSame('FFC000', $reloadedSpreadsheet->getTheme()->getThemeColors()['accent4']);
self::assertSame('Calibri Light', $reloadedSpreadsheet->getTheme()->getMajorFontLatin());
self::assertSame('Calibri', $reloadedSpreadsheet->getTheme()->getMinorFontLatin());
$defaultFont2 = $reloadedSpreadsheet->getDefaultStyle()->getFont()->getName();
self::assertSame('Calibri', $defaultFont2);
$font3 = $reloadedSpreadsheet->getActiveSheet()
->getStyle('Z10')->getFont()->getName();
self::assertSame('Calibri', $font3);
$reloadedSpreadsheet->disconnectWorksheets();
}
@@ -30,6 +68,13 @@ class ThemeColorsTest extends AbstractFunctional
$spreadsheet->disconnectWorksheets();
self::assertSame('Office 2007-2010', $reloadedSpreadsheet->getTheme()->getThemeColorName());
self::assertSame('8064A2', $reloadedSpreadsheet->getTheme()->getThemeColors()['accent4']);
self::assertSame('Cambria', $reloadedSpreadsheet->getTheme()->getMajorFontLatin());
self::assertSame('Calibri', $reloadedSpreadsheet->getTheme()->getMinorFontLatin());
$defaultFont2 = $reloadedSpreadsheet->getDefaultStyle()->getFont()->getName();
self::assertSame('Calibri', $defaultFont2);
$font3 = $reloadedSpreadsheet->getActiveSheet()
->getStyle('Z10')->getFont()->getName();
self::assertSame('Calibri', $font3);
$reloadedSpreadsheet->disconnectWorksheets();
}
@@ -40,6 +85,13 @@ class ThemeColorsTest extends AbstractFunctional
$spreadsheet->disconnectWorksheets();
self::assertSame('Office', $reloadedSpreadsheet->getTheme()->getThemeColorName());
self::assertSame('8064A2', $reloadedSpreadsheet->getTheme()->getThemeColors()['accent4']);
self::assertSame('Cambria', $reloadedSpreadsheet->getTheme()->getMajorFontLatin());
self::assertSame('Calibri', $reloadedSpreadsheet->getTheme()->getMinorFontLatin());
$defaultFont2 = $reloadedSpreadsheet->getDefaultStyle()->getFont()->getName();
self::assertSame('Calibri', $defaultFont2);
$font3 = $reloadedSpreadsheet->getActiveSheet()
->getStyle('Z10')->getFont()->getName();
self::assertSame('Calibri', $font3);
$reloadedSpreadsheet->disconnectWorksheets();
}
@@ -53,4 +105,37 @@ class ThemeColorsTest extends AbstractFunctional
self::assertSame('795FAF', $reloadedSpreadsheet->getTheme()->getThemeColors()['accent4']);
$reloadedSpreadsheet->disconnectWorksheets();
}
public function testOffice2023Theme(): void
{
$spreadsheet = new Spreadsheet();
$spreadsheet->getTheme()
->setThemeColorName(
SpreadsheetTheme::COLOR_SCHEME_2023_PLUS_NAME,
null,
$spreadsheet
);
self::assertSame('Aptos Narrow', $spreadsheet->getDefaultStyle()->getFont()->getName(), 'default style is attached to spreadsheet');
$style = new Style();
self::assertSame('Calibri', $style->getFont()->getName(), 'style not attached to spreadsheet');
$style2 = $spreadsheet->getActiveSheet()->getStyle('A7');
self::assertSame('Aptos Narrow', $style2->getFont()->getName(), 'font is attached to spreadsheet');
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
$spreadsheet->disconnectWorksheets();
self::assertSame(
SpreadsheetTheme::COLOR_SCHEME_2023_PLUS_NAME,
$reloadedSpreadsheet->getTheme()->getThemeColorName()
);
self::assertSame('0F9ED5', $reloadedSpreadsheet->getTheme()->getThemeColors()['accent4']);
self::assertSame('Aptos Display', $reloadedSpreadsheet->getTheme()->getMajorFontLatin());
self::assertSame('Aptos Narrow', $reloadedSpreadsheet->getTheme()->getMinorFontLatin());
$defaultFont = $reloadedSpreadsheet->getDefaultStyle()->getFont()->getName();
self::assertSame('Aptos Narrow', $defaultFont);
$defaultFont2 = $reloadedSpreadsheet->getDefaultStyle()->getFont()->getName();
self::assertSame('Aptos Narrow', $defaultFont2);
$font3 = $reloadedSpreadsheet->getActiveSheet()
->getStyle('Z10')->getFont()->getName();
self::assertSame('Aptos Narrow', $font3);
$reloadedSpreadsheet->disconnectWorksheets();
}
}