Compare commits
1 Commits
main
...
feature/ni
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6740a43fe6 |
@@ -1931,16 +1931,32 @@ impl Model {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Returns markup representation of the given `sheet`.
|
/// Returns markup representation of the given `sheet`.
|
||||||
pub fn get_sheet_markup(&self, sheet: u32) -> Result<String, String> {
|
pub fn get_sheet_markup(
|
||||||
let worksheet = self.workbook.worksheet(sheet)?;
|
&self,
|
||||||
let dimension = worksheet.dimension();
|
sheet: u32,
|
||||||
|
start_row: i32,
|
||||||
|
start_column: i32,
|
||||||
|
width: i32,
|
||||||
|
height: i32,
|
||||||
|
) -> Result<String, String> {
|
||||||
|
let mut table: Vec<Vec<String>> = Vec::new();
|
||||||
|
if start_row < 1 || start_column < 1 {
|
||||||
|
return Err("Start row and column must be positive".to_string());
|
||||||
|
}
|
||||||
|
if start_row + height >= LAST_ROW || start_column + width >= LAST_COLUMN {
|
||||||
|
return Err("Start row and column exceed the maximum allowed".to_string());
|
||||||
|
}
|
||||||
|
if height <= 0 || width <= 0 {
|
||||||
|
return Err("Height must be positive and width must be positive".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
let mut rows = Vec::new();
|
// a mutable vector to store the column widths of length `width + 1`
|
||||||
|
let mut column_widths: Vec<f64> = vec![0.0; (width + 1) as usize];
|
||||||
|
|
||||||
for row in 1..(dimension.max_row + 1) {
|
for row in start_row..(start_row + height + 1) {
|
||||||
let mut row_markup: Vec<String> = Vec::new();
|
let mut row_markup: Vec<String> = Vec::new();
|
||||||
|
|
||||||
for column in 1..(dimension.max_column + 1) {
|
for column in start_column..(start_column + width + 1) {
|
||||||
let mut cell_markup = match self.get_cell_formula(sheet, row, column)? {
|
let mut cell_markup = match self.get_cell_formula(sheet, row, column)? {
|
||||||
Some(formula) => formula,
|
Some(formula) => formula,
|
||||||
None => self.get_formatted_cell_value(sheet, row, column)?,
|
None => self.get_formatted_cell_value(sheet, row, column)?,
|
||||||
@@ -1949,12 +1965,34 @@ impl Model {
|
|||||||
if style.font.b {
|
if style.font.b {
|
||||||
cell_markup = format!("**{cell_markup}**")
|
cell_markup = format!("**{cell_markup}**")
|
||||||
}
|
}
|
||||||
|
column_widths[(column - start_column) as usize] =
|
||||||
|
column_widths[(column - start_column) as usize].max(cell_markup.len() as f64);
|
||||||
row_markup.push(cell_markup);
|
row_markup.push(cell_markup);
|
||||||
}
|
}
|
||||||
|
|
||||||
rows.push(row_markup.join("|"));
|
table.push(row_markup);
|
||||||
}
|
}
|
||||||
|
let mut rows = Vec::new();
|
||||||
|
for (j, row) in table.iter().enumerate() {
|
||||||
|
if j == 1 {
|
||||||
|
let mut row_markup = String::new();
|
||||||
|
for i in 0..(width + 1) {
|
||||||
|
row_markup.push('|');
|
||||||
|
let wide = column_widths[i as usize] as usize;
|
||||||
|
row_markup.push_str(&"-".repeat(wide));
|
||||||
|
}
|
||||||
|
rows.push(row_markup);
|
||||||
|
}
|
||||||
|
let mut row_markup = String::new();
|
||||||
|
|
||||||
|
for (i, cell) in row.iter().enumerate() {
|
||||||
|
row_markup.push('|');
|
||||||
|
let wide = column_widths[i] as usize;
|
||||||
|
// Add padding to the cell content
|
||||||
|
row_markup.push_str(&format!("{:<wide$}", cell, wide = wide));
|
||||||
|
}
|
||||||
|
rows.push(row_markup);
|
||||||
|
}
|
||||||
Ok(rows.join("\n"))
|
Ok(rows.join("\n"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ fn test_sheet_markup() {
|
|||||||
model.set_cell_style(0, 4, 1, &style).unwrap();
|
model.set_cell_style(0, 4, 1, &style).unwrap();
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
model.get_sheet_markup(0),
|
model.get_sheet_markup(0, 1, 1, 4, 2),
|
||||||
Ok("**Item**|**Cost**\nRent|$600\nElectricity|$200\n**Total**|=SUM(B2:B3)".to_string()),
|
Ok("**Item**|**Cost**\nRent|$600\nElectricity|$200\n**Total**|=SUM(B2:B3)".to_string()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -293,6 +293,19 @@ impl UserModel {
|
|||||||
self.model.workbook.name = name.to_string();
|
self.model.workbook.name = name.to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Get area markdown
|
||||||
|
pub fn get_sheet_markup(
|
||||||
|
&self,
|
||||||
|
sheet: u32,
|
||||||
|
row_start: i32,
|
||||||
|
column_start: i32,
|
||||||
|
row_end: i32,
|
||||||
|
column_end: i32,
|
||||||
|
) -> Result<String, String> {
|
||||||
|
self.model
|
||||||
|
.get_sheet_markup(sheet, row_start, column_start, row_end, column_end)
|
||||||
|
}
|
||||||
|
|
||||||
/// Undoes last change if any, places the change in the redo list and evaluates the model if needed
|
/// Undoes last change if any, places the change in the redo list and evaluates the model if needed
|
||||||
///
|
///
|
||||||
/// See also:
|
/// See also:
|
||||||
|
|||||||
@@ -672,4 +672,18 @@ impl Model {
|
|||||||
.delete_defined_name(name, scope)
|
.delete_defined_name(name, scope)
|
||||||
.map_err(|e| to_js_error(e.to_string()))
|
.map_err(|e| to_js_error(e.to_string()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "getSheetMarkup")]
|
||||||
|
pub fn get_sheet_markup(
|
||||||
|
&self,
|
||||||
|
sheet: u32,
|
||||||
|
start_row: i32,
|
||||||
|
start_column: i32,
|
||||||
|
end_row: i32,
|
||||||
|
end_column: i32,
|
||||||
|
) -> Result<String, JsError> {
|
||||||
|
self.model
|
||||||
|
.get_sheet_markup(sheet, start_row, start_column, end_row, end_column)
|
||||||
|
.map_err(to_js_error)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ import {
|
|||||||
ArrowMiddleFromLine,
|
ArrowMiddleFromLine,
|
||||||
DecimalPlacesDecreaseIcon,
|
DecimalPlacesDecreaseIcon,
|
||||||
DecimalPlacesIncreaseIcon,
|
DecimalPlacesIncreaseIcon,
|
||||||
|
Markdown,
|
||||||
} from "../../icons";
|
} from "../../icons";
|
||||||
import { theme } from "../../theme";
|
import { theme } from "../../theme";
|
||||||
import BorderPicker from "../BorderPicker/BorderPicker";
|
import BorderPicker from "../BorderPicker/BorderPicker";
|
||||||
@@ -74,6 +75,7 @@ type ToolbarProperties = {
|
|||||||
onClearFormatting: () => void;
|
onClearFormatting: () => void;
|
||||||
onIncreaseFontSize: (delta: number) => void;
|
onIncreaseFontSize: (delta: number) => void;
|
||||||
onDownloadPNG: () => void;
|
onDownloadPNG: () => void;
|
||||||
|
onCopyMarkdown: () => void;
|
||||||
fillColor: string;
|
fillColor: string;
|
||||||
fontColor: string;
|
fontColor: string;
|
||||||
fontSize: number;
|
fontSize: number;
|
||||||
@@ -429,6 +431,17 @@ function Toolbar(properties: ToolbarProperties) {
|
|||||||
>
|
>
|
||||||
<ImageDown />
|
<ImageDown />
|
||||||
</StyledButton>
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
type="button"
|
||||||
|
$pressed={false}
|
||||||
|
onClick={() => {
|
||||||
|
properties.onCopyMarkdown();
|
||||||
|
}}
|
||||||
|
disabled={!canEdit}
|
||||||
|
title={t("toolbar.selected_markdown")}
|
||||||
|
>
|
||||||
|
<Markdown />
|
||||||
|
</StyledButton>
|
||||||
|
|
||||||
<ColorPicker
|
<ColorPicker
|
||||||
color={properties.fontColor}
|
color={properties.fontColor}
|
||||||
|
|||||||
@@ -558,6 +558,26 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
|
|||||||
onIncreaseFontSize={(delta: number) => {
|
onIncreaseFontSize={(delta: number) => {
|
||||||
onIncreaseFontSize(delta);
|
onIncreaseFontSize(delta);
|
||||||
}}
|
}}
|
||||||
|
onCopyMarkdown={async () => {
|
||||||
|
const {
|
||||||
|
sheet,
|
||||||
|
range: [rowStart, columnStart, rowEnd, columnEnd],
|
||||||
|
} = model.getSelectedView();
|
||||||
|
const row = Math.min(rowStart, rowEnd);
|
||||||
|
const column = Math.min(columnStart, columnEnd);
|
||||||
|
const width = Math.abs(columnEnd - columnStart) + 1;
|
||||||
|
const height = Math.abs(rowEnd - rowStart) + 1;
|
||||||
|
const markdown = model.getSheetMarkup(
|
||||||
|
sheet,
|
||||||
|
row,
|
||||||
|
column,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
);
|
||||||
|
// Copy to clipboard
|
||||||
|
// NB: This will not work in non secure contexts or in iframes (i.e storybook)
|
||||||
|
await navigator.clipboard.writeText(markdown);
|
||||||
|
}}
|
||||||
onDownloadPNG={() => {
|
onDownloadPNG={() => {
|
||||||
// creates a new canvas element in the visible part of the the selected area
|
// creates a new canvas element in the visible part of the the selected area
|
||||||
const worksheetCanvas = worksheetRef.current?.getCanvas();
|
const worksheetCanvas = worksheetRef.current?.getCanvas();
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import InsertColumnLeftIcon from "./insert-column-left.svg?react";
|
|||||||
import InsertColumnRightIcon from "./insert-column-right.svg?react";
|
import InsertColumnRightIcon from "./insert-column-right.svg?react";
|
||||||
import InsertRowAboveIcon from "./insert-row-above.svg?react";
|
import InsertRowAboveIcon from "./insert-row-above.svg?react";
|
||||||
import InsertRowBelow from "./insert-row-below.svg?react";
|
import InsertRowBelow from "./insert-row-below.svg?react";
|
||||||
|
import Markdown from "./markdown.svg?react";
|
||||||
|
|
||||||
import IronCalcIcon from "./ironcalc_icon.svg?react";
|
import IronCalcIcon from "./ironcalc_icon.svg?react";
|
||||||
import IronCalcLogo from "./orange+black.svg?react";
|
import IronCalcLogo from "./orange+black.svg?react";
|
||||||
@@ -48,4 +49,5 @@ export {
|
|||||||
IronCalcIcon,
|
IronCalcIcon,
|
||||||
IronCalcLogo,
|
IronCalcLogo,
|
||||||
Fx,
|
Fx,
|
||||||
|
Markdown,
|
||||||
};
|
};
|
||||||
|
|||||||
8
webapp/IronCalc/src/icons/markdown.svg
Normal file
8
webapp/IronCalc/src/icons/markdown.svg
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
|
||||||
|
<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<g>
|
||||||
|
<path fill="none" d="M0 0h24v24H0z"/>
|
||||||
|
<path fill-rule="nonzero" d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm1 2v14h16V5H4zm3 10.5H5v-7h2l2 2 2-2h2v7h-2v-4l-2 2-2-2v4zm11-3h2l-3 3-3-3h2v-4h2v4z"/>
|
||||||
|
</g>
|
||||||
|
After Width: | Height: | Size: 477 B |
@@ -26,6 +26,7 @@
|
|||||||
"vertical_align_middle": " Align middle",
|
"vertical_align_middle": " Align middle",
|
||||||
"vertical_align_top": "Align top",
|
"vertical_align_top": "Align top",
|
||||||
"selected_png": "Export Selected area as PNG",
|
"selected_png": "Export Selected area as PNG",
|
||||||
|
"selected_markdown": "Export Selected area as Markdown",
|
||||||
"wrap_text": "Wrap text",
|
"wrap_text": "Wrap text",
|
||||||
"format_menu": {
|
"format_menu": {
|
||||||
"auto": "Auto",
|
"auto": "Auto",
|
||||||
|
|||||||
Reference in New Issue
Block a user